winbind: Don't leak memory on return.
[Samba.git] / packaging / RHEL-CTDB / samba.spec.tmpl
blobc1789f23764cb2491487983be1153df6dc236411
1 %define initdir %{_sysconfdir}/rc.d/init.d
2 %define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
4 Summary: Samba SMB client and server
5 Vendor: Samba Team
6 Packager: Samba Team <samba@samba.org>
7 Name:         samba
8 Version:      PVERSION
9 Release:      1GITHASH
10 Epoch:        0
11 License: GNU GPL version 3
12 Group: System Environment/Daemons
13 URL: http://www.samba.org/
15 Source: samba-%{version}.tar.bz2
17 # Don't depend on Net::LDAP
18 Source998: filter-requires-samba.sh
19 Source999: setup.tar.bz2
21 Requires: /sbin/chkconfig /bin/mktemp /usr/bin/killall
22 Requires: fileutils sed /etc/init.d
24 Requires: pam >= 0.64 %{auth} 
25 Requires: samba-common = %{version}-%{release}
26 Provides: samba = %{version}
28 Prefix: /usr
29 BuildRoot: %{_tmppath}/%{name}-%{version}-root
30 BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, e2fsprogs-devel, gettext
31 # requirements for building the man pages:
32 BuildRequires: libxslt, docbook-utils, docbook-style-xsl, rsync
33 BuildRequires: ctdb-devel >= 1.2.25
35 # Working around perl dependency problem from docs
36 %define __perl_requires %{SOURCE998}
38 # rpm screws up the arch lib dir when using --target on RHEL5
39 %ifarch i386 i486 i586 i686 ppc s390
40 %define _libarch lib
41 %else
42 %define _libarch %_lib
43 %endif
45 %define _libarchdir /usr/%{_libarch}
47 %define numcpu  %(grep "^processor" /proc/cpuinfo |wc -l | sed -e 's/^0$/1/')
49 %define with_vfs_gpfs PGPFS_DEFAULT
50 %define with_vfs_tsmsm PGPFS_DEFAULT
52 %if %{with_vfs_tsmsm}
53 %define         vfs_tsmsm       ,vfs_tsmsm
54 %endif
56 %if %{with_vfs_gpfs}
57 %define         vfs_gpfs        ,vfs_gpfs
58 %endif
60 %define         vfs_modules %{?vfs_gpfs}%{?vfs_tsmsm}
62 %define         shared_modules idmap_rid,idmap_ad,idmap_tdb2%{vfs_modules}
64 %description
65 Samba is the protocol by which a lot of PC-related machines share
66 files, printers, and other information (such as lists of available
67 files and printers). The Windows NT, OS/2, and Linux operating systems
68 support this natively, and add-on packages can enable the same thing
69 for DOS, Windows, VMS, UNIX of all kinds, MVS, and more. This package
70 provides an SMB server that can be used to provide network services to
71 SMB (sometimes called "Lan Manager") clients. Samba uses NetBIOS over
72 TCP/IP (NetBT) protocols and does NOT need the NetBEUI (Microsoft Raw
73 NetBIOS frame) protocol.
76 ######################################################################
77 %package client
78 Summary: Samba (SMB) client programs.
79 Group: Applications/System
80 Requires: samba-common = %{version}-%{release}
81 Obsoletes: smbfs
82 Provides: samba-client = %{version}-%{release}
84 %description client
85 The samba-client package provides some SMB clients to compliment the
86 built-in SMB filesystem in Linux. These clients allow access of SMB
87 shares and printing to SMB printers.
90 #######################################################################
91 %package common
92 Summary: Files used by both Samba servers and clients.
93 Group: Applications/System
94 Provides: samba-common = %{version}-%{release}
96 %description common
97 Samba-common provides files necessary for both the server and client
98 packages of Samba.
102 #######################################################################
103 %package swat
104 Summary: The Samba SMB server configuration program.
105 Group: Applications/System
106 Requires: samba = %{version} xinetd
107 Provides: samba-swat = %{version}-%{release}
109 %description swat
110 The samba-swat package includes the new SWAT (Samba Web Administration
111 Tool), for remotely managing Samba's smb.conf file using your favorite
112 Web browser.
115 #######################################################################
116 %package doc
117 Summary:      Samba Documentation
118 Group:        Documentation/Other
119 Provides:     samba-doc = %{version}-%{release}
120 Requires:       /usr/bin/find /bin/rm /usr/bin/xargs
122 %description doc
123 The samba-doc package includes the HTML versions of the Samba manpages
124 utilized by SWAT as well as the HTML and PDF version of "Using Samba",
125 "Samba By Example", and "The Official Samba HOWTO and Reference Guide".
128 #######################################################################
130 %prep
131 %setup -q
133 # setup the vendor files (init scripts, etc...)
134 %setup -T -D -a 999 -n samba-%{version} -q
136 %build
138 /bin/cp setup/filter-requires-samba.sh %{SOURCE998}
140 cd source3
141 # RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
143 ## check for ccache
144 if ccache -h >/dev/null 2>&1 ; then
145         CC="ccache gcc"
146 else
147         CC="gcc"
150 export CC
152 ## always run autogen.sh
153 ./autogen.sh
155 CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
156         --prefix=%{_prefix} \
157         --localstatedir=/var \
158         --with-configdir=%{_sysconfdir}/samba \
159         --libdir=%{_libarchdir} \
160         --with-modulesdir=%{_libarchdir}/samba \
161         --with-pammodulesdir=/%{_libarch}/security \
162         --with-lockdir=/var/lib/samba \
163         --with-logfilebase=/var/log/samba \
164         --mandir=%{_mandir} \
165         --with-piddir=/var/run \
166         --with-privatedir=%{_sysconfdir}/samba \
167         --disable-cups \
168         --with-acl-support \
169         --with-ads \
170         --with-automount \
171         --enable-fhs \
172         --with-pam_smbpass \
173         --with-libsmbclient \
174         --with-libsmbsharemodes \
175         --without-smbwrapper \
176         --with-pam \
177         --with-quotas \
178         --with-shared-modules=%{shared_modules} \
179         --with-syslog \
180         --with-utmp \
181         --with-cluster-support \
182         --with-ctdb=/usr/include \
183         --without-ldb \
184         --without-dnsupdate \
185         --with-aio-support \
186         --disable-external-libtalloc \
187         --disable-external-libtdb
189 make showlayout
191 ## check for gcc 3.4 or later
192 CC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
193 CC_MAJOR=`echo ${CC_VERSION} | cut -d. -f 1`
194 CC_MINOR=`echo ${CC_VERSION} | cut -d. -f 2`
195 if [ ${CC_MAJOR} -ge 3 ]; then
196         if [ ${CC_MAJOR} -gt 3 -o ${CC_MINOR} -ge 4 ]; then
197                 make pch
198         fi
202 make -j %{numcpu} %{?_smp_mflags} \
203         everything modules pam_smbpass
205 # check that desired suppor has been compiled into smbd:
206 export LD_LIBRARY_PATH=./bin
208 HAVE_VARS="HAVE_POSIX_ACLS HAVE_LDAP HAVE_KRB5 CLUSTER_SUPPORT"
209 %if %{with_vfs_gpfs}
210         HAVE_VARS="${HAVE_VARS} HAVE_GPFS"
211 %endif
212 for test in ${HAVE_VARS}
214         if ! $(./bin/smbd -b | grep -q $test ) ; then
215                 echo "ERROR: '$test' is not in smbd. Build stopped."
216                 exit 1;
217         fi
218 done
220 # try and build the manpages
221 cd ..
222 ./release-scripts/build-manpages-nogit
224 # Remove some permission bits to avoid to many dependencies
225 find examples docs -type f | xargs -r chmod -x
227 %install
228 # Clean up in case there is trash left from a previous build
229 rm -rf $RPM_BUILD_ROOT
231 # Create the target build directory hierarchy
232 mkdir -p $RPM_BUILD_ROOT%{_datadir}/samba/swat/{help,include,using_samba/{figs,gifsa}}
233 mkdir -p $RPM_BUILD_ROOT%{_includedir}
234 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
235 mkdir -p $RPM_BUILD_ROOT{%{_libarchdir},%{_includedir}}
236 mkdir -p $RPM_BUILD_ROOT%{_libarchdir}/samba/{auth,charset,idmap,vfs,pdb}
237 mkdir -p $RPM_BUILD_ROOT/%{_libarch}/security
238 mkdir -p $RPM_BUILD_ROOT/lib/security
239 mkdir -p $RPM_BUILD_ROOT%{_mandir}
240 mkdir -p $RPM_BUILD_ROOT%{_prefix}/{bin,sbin}
241 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
242 mkdir -p $RPM_BUILD_ROOT/sbin
243 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,samba}
244 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d}
245 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
246 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{samba,sysconfig}
247 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
248 mkdir -p $RPM_BUILD_ROOT/var/lib/samba/winbindd_privileged
249 mkdir -p $RPM_BUILD_ROOT/var/{log,run/winbindd,spool}/samba
250 mkdir -p $RPM_BUILD_ROOT/%{_libarchdir}/krb5/plugins/libkrb5
252 cd source3
253 make DESTDIR=$RPM_BUILD_ROOT \
254         install
256 make DESTDIR=$RPM_BUILD_ROOT \
257         install-dbwrap_tool install-dbwrap_torture
258 cd ..
260 # NSS winbind support
261 install -m 755 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
262 ( cd $RPM_BUILD_ROOT/%{_libarch};
263   ln -sf libnss_winbind.so.2  libnss_winbind.so )
265 # do not install libnss_wins.so in order to reduce dependencies
266 # (we do not need it for the samba-ctdb scenario)
268 #install -m 755 nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
269 # ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_wins.so  libnss_wins.so.2 )
271 cp -p source3/bin/winbind_krb5_locator.so ${RPM_BUILD_ROOT}/%{_libarchdir}/krb5/plugins/libkrb5
274 ## cleanup
275 /bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security
277 # remove installed but unpackaged files:
278 /bin/rm -f $RPM_BUILD_ROOT/usr/lib*/libtalloc.so
279 /bin/rm -f $RPM_BUILD_ROOT/usr/lib*/libtdb.so
280 /bin/rm -f $RPM_BUILD_ROOT/usr/lib*/samba/perfcount/pc_test.so
283 # Install the miscellany
284 echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
286 install -m644 setup/swat $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
287 install -m644 setup/samba.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
288 install -m755 setup/smb.init $RPM_BUILD_ROOT%{initdir}/smb
289 install -m755 setup/winbind.init $RPM_BUILD_ROOT%{initdir}/winbind
290 install -m644 setup/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
291 install -m755 packaging/printing/smbprint $RPM_BUILD_ROOT%{_bindir}
292 install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
293 install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
294 install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
296 ln -s ../..%{initdir}/smb  $RPM_BUILD_ROOT%{_sbindir}/samba
297 ln -s ../..%{initdir}/winbind  $RPM_BUILD_ROOT%{_sbindir}/winbind
299 # Remove "*.old" files
300 find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \;
304 ## Clean out man pages for tools not installed here
306 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1*
307 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbsh.1*
308 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/vfstest.1*
309 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/samba-tool.8*
310 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/samba.8*
313 %clean
314 rm -rf $RPM_BUILD_ROOT
316 %post
317 ## deal with an upgrade from a broken 3.0.21b RPM
318 if [ "$1" -eq "2" ]; then
319         if [ -d /var/cache/samba ]; then
320                 for file in `ls /var/cache/samba/*tdb`; do
321                         /bin/cp -up $file /var/lib/samba/`basename $file`
322                 done
323                 mkdir -p /var/lib/samba/eventlog
324                 for file in `ls /var/cache/samba/eventlog/*tdb`; do
325                         /bin/cp -up $file /var/lib/samba/eventlog/`basename $file`
326                 done
327                 /bin/mv /var/cache/samba /var/cache/samba.moved
328         fi
331 if [ "$1" -ge "1" ]; then
332         /sbin/service smb condrestart >/dev/null 2>&1 || :
335 %preun
336 if [ $1 = 0 ] ; then
337     /sbin/service smb stop >/dev/null 2>&1 || :
338     /sbin/chkconfig --del smb
339     # rm -rf /var/log/samba/* /var/lib/samba/*
341 exit 0
343 #%postun
345 %post swat
346 # Add swat entry to /etc/services if not already there.
347 if [ ! "`grep ^\s**swat /etc/services`" ]; then
348         echo 'swat        901/tcp     # Add swat service used via inetd' >> /etc/services
351 %post common
352 /sbin/ldconfig
354 if [ "$1" -ge "1" ]; then
355         /sbin/service winbind condrestart >/dev/null 2>&1 || :
358 %preun common
359 if [ $1 = 0 ] ; then
360     /sbin/service winbind stop >/dev/null 2>&1 || :
361     /sbin/chkconfig --del winbind
363 exit 0
365 %postun common 
366 /sbin/ldconfig
368 #######################################################################
369 ## Files section                                                     ##
370 #######################################################################
372 %files
373 %defattr(-,root,root)
375 %config(noreplace) %{_sysconfdir}/sysconfig/samba
376 %config(noreplace) %{_sysconfdir}/samba/smbusers
377 %attr(755,root,root) %config %{initdir}/smb
378 %config(noreplace) %{_sysconfdir}/pam.d/samba
380 %attr(0755,root,root) %dir /var/log/samba
381 %attr(0755,root,root) %dir /var/lib/samba
382 %attr(1777,root,root) %dir /var/spool/samba
384 %{_sbindir}/samba
386 %{_sbindir}/smbd
387 %{_sbindir}/nmbd
389 %{_bindir}/mksmbpasswd.sh
390 %{_bindir}/smbcontrol
391 %{_bindir}/smbstatus
392 %{_bindir}/tdbbackup
393 %{_bindir}/tdbtool
394 %{_bindir}/tdbdump
395 %{_bindir}/tdbrestore
396 %{_bindir}/eventlogadm
398 %{_libarchdir}/samba/auth/script.so
399 %{_libarchdir}/samba/vfs/acl_tdb.so
400 %{_libarchdir}/samba/vfs/acl_xattr.so
401 %{_libarchdir}/samba/vfs/aio_fork.so
402 %{_libarchdir}/samba/vfs/audit.so
403 %{_libarchdir}/samba/vfs/cap.so
404 %{_libarchdir}/samba/vfs/catia.so
405 %{_libarchdir}/samba/vfs/crossrename.so
406 %{_libarchdir}/samba/vfs/default_quota.so
407 %{_libarchdir}/samba/vfs/dirsort.so
408 %{_libarchdir}/samba/vfs/expand_msdfs.so
409 %{_libarchdir}/samba/vfs/extd_audit.so
410 %{_libarchdir}/samba/vfs/fake_acls.so
411 %{_libarchdir}/samba/vfs/fake_perms.so
412 %{_libarchdir}/samba/vfs/fileid.so
413 %{_libarchdir}/samba/vfs/full_audit.so
414 %if %{with_vfs_gpfs}
415 %{_libarchdir}/samba/vfs/gpfs.so
416 %endif
417 %{_libarchdir}/samba/vfs/linux_xfs_sgid.so
418 %{_libarchdir}/samba/vfs/netatalk.so
419 %{_libarchdir}/samba/vfs/preopen.so
420 %{_libarchdir}/samba/vfs/readahead.so
421 %{_libarchdir}/samba/vfs/readonly.so
422 %{_libarchdir}/samba/vfs/recycle.so
423 %{_libarchdir}/samba/vfs/scannedonly.so
424 %{_libarchdir}/samba/vfs/shadow_copy.so
425 %{_libarchdir}/samba/vfs/shadow_copy2.so
426 %{_libarchdir}/samba/vfs/smb_traffic_analyzer.so
427 %{_libarchdir}/samba/vfs/streams_depot.so
428 %{_libarchdir}/samba/vfs/streams_xattr.so
429 %{_libarchdir}/samba/vfs/syncops.so
430 %{_libarchdir}/samba/vfs/time_audit.so
431 %if %{with_vfs_tsmsm}
432 %{_libarchdir}/samba/vfs/tsmsm.so
433 %endif
434 %{_libarchdir}/samba/vfs/xattr_tdb.so
435 %{_libarchdir}/samba/vfs/aio_posix.so
436 %{_libarchdir}/samba/vfs/aio_pthread.so
437 %{_libarchdir}/samba/vfs/media_harmony.so
439 %{_mandir}/man1/smbcontrol.1*
440 %{_mandir}/man1/smbstatus.1*
441 %{_mandir}/man1/vfstest.1*
442 %{_mandir}/man5/smbpasswd.5*
443 %{_mandir}/man5/pam_winbind.conf.5*
444 %{_mandir}/man7/samba.7*
445 %{_mandir}/man8/nmbd.8*
446 %{_mandir}/man8/pdbedit.8*
447 %{_mandir}/man8/smbd.8*
448 %{_mandir}/man8/eventlogadm.8*
449 %{_mandir}/man8/vfs_*.8*
450 %{_mandir}/man8/smbta-util.8*
453 ##########
455 %files doc
456 %defattr(-,root,root)
457 %doc README
458 %doc COPYING
459 %doc WHATSNEW.txt
460 %doc Roadmap
461 %doc docs-xml/archives/THANKS
462 %doc docs-xml/archives/history
463 %doc docs-xml/registry
464 %doc examples/autofs
465 %doc examples/LDAP
466 %doc examples/libsmbclient
467 %doc examples/misc
468 %doc examples/printer-accounting
469 %doc examples/printing
471 ##########
473 %files swat
474 %defattr(-,root,root)
475 %config(noreplace) %{_sysconfdir}/xinetd.d/swat
476 %dir %{_datadir}/samba/swat
477 %{_datadir}/samba/swat/*
478 %{_sbindir}/swat
479 %{_mandir}/man8/swat.8*
480 %attr(755,root,root) %{_datadir}/samba/codepages/*.msg
482 ##########
484 %files client
485 %defattr(-,root,root)
487 %{_bindir}/rpcclient
488 %{_bindir}/smbcacls
489 %{_bindir}/findsmb
490 %{_bindir}/nmblookup
491 %{_bindir}/smbget
492 %{_bindir}/smbclient
493 %{_bindir}/smbprint
494 %{_bindir}/smbspool
495 %{_bindir}/smbtar
496 %{_bindir}/smbtree
497 %{_bindir}/sharesec
498 %{_bindir}/smbta-util
500 %{_mandir}/man8/smbspool.8*
501 %{_mandir}/man1/smbget.1*
502 %{_mandir}/man5/smbgetrc.5*
503 %{_mandir}/man1/findsmb.1*
504 %{_mandir}/man1/nmblookup.1*
505 %{_mandir}/man1/rpcclient.1*
506 %{_mandir}/man1/smbcacls.1*
507 %{_mandir}/man1/smbclient.1*
508 %{_mandir}/man1/smbtar.1*
509 %{_mandir}/man1/smbtree.1*
510 %{_mandir}/man1/sharesec.1*
512 ##########
515 %files common
516 %defattr(-,root,root)
517 %dir %{_sysconfdir}/samba
518 %dir %{_libarchdir}/samba
519 %dir %{_libarchdir}/samba/charset
520 %config(noreplace) %{_sysconfdir}/samba/smb.conf
521 %config(noreplace) %{_sysconfdir}/samba/lmhosts
522 %attr(755,root,root) %config %{initdir}/winbind
524 %attr(755,root,root) /%{_libarch}/libnss_winbind.so
525 %attr(755,root,root) /%{_libarch}/libnss_winbind.so.2
526 %attr(755,root,root) /%{_libarch}/security/pam_winbind.so
527 %attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
528 /usr/share/locale/*/LC_MESSAGES/pam_winbind.mo
529 /usr/share/locale/*/LC_MESSAGES/net.mo
531 %{_libarchdir}/samba/idmap/ad.so
532 %{_libarchdir}/samba/idmap/rid.so
533 %{_libarchdir}/samba/idmap/tdb2.so
534 %{_libarchdir}/samba/idmap/autorid.so
535 %{_libarchdir}/samba/idmap/hash.so
536 %{_libarchdir}/samba/nss_info/hash.so
537 %{_libarchdir}/samba/nss_info/rfc2307.so
538 %{_libarchdir}/samba/nss_info/sfu.so
539 %{_libarchdir}/samba/nss_info/sfu20.so
540 %{_datadir}/samba/codepages/lowcase.dat
541 %{_datadir}/samba/codepages/upcase.dat
542 %{_datadir}/samba/codepages/valid.dat
544 %{_includedir}/libsmbclient.h
545 %{_libarchdir}/libsmbclient.*
546 %{_includedir}/smb_share_modes.h
547 %{_libarchdir}/libsmbsharemodes.so
548 %{_libarchdir}/libsmbsharemodes.so.0
550 %{_includedir}/netapi.h
551 %{_includedir}/wbclient.h
552 %{_libarchdir}/libnetapi.so
553 %{_libarchdir}/libnetapi.so.0
554 %{_libarchdir}/libwbclient.so
555 %{_libarchdir}/libwbclient.so.0
557 %{_libarchdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
559 %{_sbindir}/winbind
561 %{_sbindir}/winbindd
562 %{_bindir}/testparm
563 %{_bindir}/smbpasswd
564 %{_bindir}/profiles
565 %{_bindir}/net
566 %{_bindir}/wbinfo
567 %{_bindir}/ntlm_auth
568 %{_bindir}/pdbedit
569 %{_bindir}/smbcquotas
570 %{_bindir}/dbwrap_tool
571 %{_bindir}/dbwrap_torture
573 %{_mandir}/man1/ntlm_auth.1*
574 %{_mandir}/man1/profiles.1*
575 %{_mandir}/man1/smbcquotas.1*
576 %{_mandir}/man1/testparm.1*
577 %{_mandir}/man5/smb.conf.5*
578 %{_mandir}/man5/lmhosts.5*
579 %{_mandir}/man8/smbpasswd.8*
580 %{_mandir}/man1/wbinfo.1*
581 %{_mandir}/man8/winbindd.8*
582 %{_mandir}/man8/net.8*
583 %{_mandir}/man8/pam_winbind.8*
584 %{_mandir}/man7/libsmbclient.7*
585 %{_mandir}/man7/winbind_krb5_locator.7*
586 %{_mandir}/man8/idmap_*.8*
590 %changelog
591 * Fri Jan 16 2004 Gerald (Jerry) Carter <jerry@samba,org>
592 - Removed ChangeLog entries since they are kept in CVS