Bugzilla Bug 71235

I have the following 2 lines in my ntp.conf:
server ntp1.cmc.ec.gc.ca iburst prefer
server ntp2.cmc.ec.gc.ca iburst

After using the 'Select Servers' Button in 'Time and Data Settings', they become:
server ntp1.cmc.ec.gc.caiburstprefer
server ntp2.cmc.ec.gc.caiburst


Reproducible: Always
Steps to Reproduce:
1. Right-click on the 'Clock' Applet in my panel
2. Chose 'Adjust Date & Time'
3. Enter the root password
4. Click the 'Select Servers...' Button
5. Make any change
6. Click the 'Close' Button
7. Click the 'OK' Button
Actual Results:  
the spaces are removed from the server lines as mentioned in the Details section.

Expected Results:  
Correctly interpreted and saved 'iburst' and 'prefer' as options and not as part
of the server address.

[ebuild   R   ] gnome-base/gnome-2.8.0-r1  -accessibility +cdr +dvdr -hal
[ebuild   R   ] net-misc/ntp-4.2.0-r2  -debug -nodroproot -parse-clocks
(-selinux) +ssl

Whole system ACCEPT_KEYWORDS="x86" with the exception of some
should-be-unrelated things ( nvidia gfx drivers, linux-headers, some disabled
COMPOSITE things ).  RSynced and `emerge -Duv world`ed within the past 6 hours.

etc # emerge info
Portage 2.0.51-r3 (default-x86-2004.2, gcc-3.3.4, glibc-2.3.4.20040808-r1,
2.6.9-gentoo-r4-me22 i686)
=================================================================
System uname: 2.6.9-gentoo-r4-me22 i686 AMD Athlon(tm) XP 2400+
Gentoo Base System version 1.4.16
Autoconf: sys-devel/autoconf-2.59-r5
Automake: sys-devel/automake-1.8.5-r1
Binutils: sys-devel/binutils-2.14.90.0.8-r1
Headers:  sys-kernel/linux26-headers-2.6.8.1-r1
Libtools: sys-devel/libtool-1.5.2-r5
ACCEPT_KEYWORDS="x86"
AUTOCLEAN="yes"
CFLAGS="-O3 -march=athlon-xp -pipe -fomit-frame-pointer"
CHOST="i686-pc-linux-gnu"
COMPILER=""
CONFIG_PROTECT="/etc /usr/X11R6/lib/X11/xkb /usr/kde/2/share/config
/usr/kde/3.3/env /usr/kde/3.3/share/config /usr/kde/3.3/shutdown
/usr/kde/3/share/config /usr/share/config /usr/share/texmf/dvipdfm/config/
/usr/share/texmf/dvips/config/ /usr/share/texmf/tex/generic/config/
/usr/share/texmf/tex/platex/config/ /usr/share/texmf/xdvi/ /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-O3 -march=athlon-xp -pipe -fomit-frame-pointer"
DISTDIR="/data/distfiles"
FEATURES="autoaddcvs ccache distlocks sandbox"
GENTOO_MIRRORS="ftp://gentoo.agsn.ca/"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/data/portage_tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="3dnow X aalib alsa apache2 apm audiofile avi berkdb bitmap-fonts bzlib cddb
cdparanoia cdr cjk crd crypt cups dga dio divx4linux dvd dvdr eds encode flac
foomaticdb ftp gdbm gif gnome gpm gtk gtk2 gtkhtml guile icq imlib jack jpeg kde
libg++ libwww lirc mad matrox mikmod motif mozilla mpeg msn mysql ncurses nls
nptl oggvorbis openal opengl oss pam pdflib perl png quicktime readline sdl
slang sockets spell ssl svg svga tcpd tetex tidy truetype unicode usb wxwindows
xchatdccserver xine xml xml2 xmms xv xvid zlib"

This is upstream at
<a href="http://bugzilla.gnome.org/show_bug.cgi?id=158548">http://bugzilla.gnome.org/show_bug.cgi?id=158548</a>

Joe, can you post a link back to that bug from this one as confirmation? Thanks.

Fixed upstream, I've backported the patch to 1.0.2-r1, but it'll be unnecessary
in the next version.