Re: pkg/31352

[Takahiro Kambe <taca%back-street.net@localhost>]

The following reply was made to PR pkg/31352; it has been noted by GNATS.

From: Takahiro Kambe <taca%back-street.net@localhost>
To: jlam%netbsd.org@localhost
Cc: gnats-bugs%netbsd.org@localhost, andreas%planix.com@localhost, 
ghen%telenet.be@localhost,
        nakaji%takamatsu-nct.ac.jp@localhost
Subject: Re: pkg/31352
Date: Fri, 04 Nov 2005 15:46:47 +0900 (JST)

 Here is updated diff to update samba to 3.0.20b including currently
 found three official patches, changes provided by PR pkg/31991 and
 some changes to quiet pkglint.
 
 Patch to update to samba 3.0.20b was provided by NAKAJI Hiroyuki.
 
 -- 
 Takahiro Kambe <taca%back-street.net@localhost>
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/net/samba/Makefile,v
 retrieving revision 1.146
 diff -u -u -r1.146 Makefile
 --- Makefile   19 Aug 2005 18:12:38 -0000      1.146
 +++ Makefile   4 Nov 2005 06:21:06 -0000
 @@ -1,17 +1,23 @@
  # $NetBSD: Makefile,v 1.146 2005/08/19 18:12:38 jlam Exp $
  
 -DISTNAME=             samba-3.0.14a
 -PKGREVISION=          1
 +DISTNAME=             samba-3.0.20b
  CATEGORIES=           net
 -MASTER_SITES=         ftp://ftp.samba.org/pub/samba/old-versions/ \
 -                      ftp://ring.asahi-net.or.jp/pub/net/samba/old-versions/ \
 -                      ftp://samba.anu.edu.au/pub/samba/old-versions/ \
 -                      
ftp://ftp.sunet.se/pub/unix/utilities/samba/old-versions/
 +MASTER_SITES=         ftp://ftp.samba.org/pub/samba/ \
 +                      ftp://ring.asahi-net.or.jp/pub/net/samba/ \
 +                      ftp://samba.anu.edu.au/pub/samba/ \
 +                      ftp://ftp.sunet.se/pub/unix/utilities/samba/
  COUNTRY_MIRRORS=      au1 ca fi fr it pl ru sg se us1 us6
  .for COUNTRY in ${COUNTRY_MIRRORS}
 -MASTER_SITES+=                
ftp://${COUNTRY}.samba.org/pub/samba/old-versions/
 +MASTER_SITES+=                ftp://${COUNTRY}.samba.org/pub/samba/
  .endfor
  
 +PATCH_SITES=          http://www.samba.org/samba/patches/
 +PATCHFILES=           print_lprm.patch \
 +                      quota.patch \
 +                      bug3201_wbinfo.patch
 +PATCH_DIST_STRIP=     -p2
 +PATCH_DIST_STRIP.bug3201_wbinfo.patch=        -p
 +
  MAINTAINER=           jlam%NetBSD.org@localhost
  HOMEPAGE=             http://www.samba.org/
  COMMENT=              SMB/CIFS protocol server suite
 @@ -121,14 +127,14 @@
        ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/${NSS_WINS} ${PREFIX}/lib
  .endif
        ${INSTALL_DATA_DIR} ${DOCDIR}
 -      cd ${WRKSRC}/../docs/registry; for f in *.reg; do               \
 +      cd ${BUILD_DIRS}/../docs/registry; for f in *.reg; do           \
                ${INSTALL_DATA} $${f} ${DOCDIR}/$${f};                  \
        done
        ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${EGDIR}/adduser.sh
        ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${EGDIR}/deluser.sh
 -      cd ${WRKSRC}/../examples; ${INSTALL_DATA} LDAP/samba.schema ${EGDIR}
 -      cd ${WRKSRC}/../examples; ${INSTALL_DATA} smb.conf.default ${EGDIR}
 +      cd ${BUILD_DIRS}/../examples; ${INSTALL_DATA} LDAP/samba.schema ${EGDIR}
 +      cd ${BUILD_DIRS}/../examples; ${INSTALL_DATA} smb.conf.default ${EGDIR}
        cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpasswd.sh ${EGDIR}
        cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mknissmbpwdtbl.sh ${EGDIR}
        cd ${WRKSRC}/script; ${INSTALL_SCRIPT} mksmbpasswd.sh ${EGDIR}
 Index: PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/net/samba/PLIST,v
 retrieving revision 1.31
 diff -u -u -r1.31 PLIST
 --- PLIST      5 Jun 2005 13:13:05 -0000       1.31
 +++ PLIST      4 Nov 2005 06:21:06 -0000
 @@ -22,7 +22,6 @@
  bin/tdbdump
  bin/tdbtool
  bin/testparm
 -bin/testprns
  bin/wbinfo
  include/libsmbclient.h
  ${NSS_WINBIND}
 @@ -34,11 +33,13 @@
  lib/samba/fr.msg
  lib/samba/it.msg
  lib/samba/ja.msg
 -lib/samba/libsmbclient.a
  lib/samba/libsmbclient.so
  lib/samba/libsmbclient.so.0
  lib/samba/lowcase.dat
  lib/samba/nl.msg
 +${MYSQL}lib/samba/pdb/mysql.so
 +${PGSQL}lib/samba/pdb/pgsql.so
 +${XML}lib/samba/pdb/xml.so
  lib/samba/pl.msg
  lib/samba/tr.msg
  lib/samba/upcase.dat
 @@ -82,6 +83,7 @@
  man/man5/smbgetrc.5
  man/man5/smbpasswd.5
  man/man7/samba.7
 +man/man8/libsmbclient.8
  man/man8/mount.cifs.8
  man/man8/net.8
  man/man8/nmbd.8
 @@ -96,6 +98,7 @@
  man/man8/swat.8
  man/man8/tdbbackup.8
  man/man8/tdbdump.8
 +man/man8/umount.cifs.8
  man/man8/winbindd.8
  sbin/nmbd
  sbin/smbd
 @@ -131,245 +134,253 @@
  share/examples/samba/samba.schema
  share/examples/samba/smb.conf.default
  share/examples/samba/updatesmbpasswd.sh
 -share/samba/swat/help/Samba-Developers-Guide/CodingSuggestions.html
 -share/samba/swat/help/Samba-Developers-Guide/Packaging.html
 -share/samba/swat/help/Samba-Developers-Guide/architecture.html
 -share/samba/swat/help/Samba-Developers-Guide/contributing.html
 -share/samba/swat/help/Samba-Developers-Guide/debug.html
 -share/samba/swat/help/Samba-Developers-Guide/index.html
 -share/samba/swat/help/Samba-Developers-Guide/internals.html
 -share/samba/swat/help/Samba-Developers-Guide/modules.html
 -share/samba/swat/help/Samba-Developers-Guide/netbios.html
 -share/samba/swat/help/Samba-Developers-Guide/ntdomain.html
 -share/samba/swat/help/Samba-Developers-Guide/parsing.html
 -share/samba/swat/help/Samba-Developers-Guide/pr01.html
 -share/samba/swat/help/Samba-Developers-Guide/printing.html
 -share/samba/swat/help/Samba-Developers-Guide/pt01.html
 -share/samba/swat/help/Samba-Developers-Guide/pt02.html
 -share/samba/swat/help/Samba-Developers-Guide/pt03.html
 -share/samba/swat/help/Samba-Developers-Guide/pt04.html
 -share/samba/swat/help/Samba-Developers-Guide/pt05.html
 -share/samba/swat/help/Samba-Developers-Guide/pwencrypt.html
 -share/samba/swat/help/Samba-Developers-Guide/registry.html
 -share/samba/swat/help/Samba-Developers-Guide/rpc-plugin.html
 -share/samba/swat/help/Samba-Developers-Guide/tracing.html
 -share/samba/swat/help/Samba-Developers-Guide/unix-smb.html
 -share/samba/swat/help/Samba-Developers-Guide/vfs.html
 -share/samba/swat/help/Samba-Developers-Guide/windows-debug.html
 -share/samba/swat/help/Samba-Developers-Guide/wins.html
 -share/samba/swat/help/Samba-Guide/2000users.html
 -share/samba/swat/help/Samba-Guide/Big500users.html
 -share/samba/swat/help/Samba-Guide/DomApps.html
 -share/samba/swat/help/Samba-Guide/HA.html
 -share/samba/swat/help/Samba-Guide/appendix.html
 -share/samba/swat/help/Samba-Guide/go01.html
 -share/samba/swat/help/Samba-Guide/gpl.html
 -share/samba/swat/help/Samba-Guide/happy.html
 -share/samba/swat/help/Samba-Guide/images/AccountingNetwork.png
 -share/samba/swat/help/Samba-Guide/images/Charity-Network.png
 -share/samba/swat/help/Samba-Guide/images/HostAnnouncment.png
 -share/samba/swat/help/Samba-Guide/images/NullConnect.png
 -share/samba/swat/help/Samba-Guide/images/UNIX-Samba-and-LDAP.png
 -share/samba/swat/help/Samba-Guide/images/UserConnect.png
 -share/samba/swat/help/Samba-Guide/images/UserMgrNT4.png
 -share/samba/swat/help/Samba-Guide/images/WINREPRESSME-Capture.png
 -share/samba/swat/help/Samba-Guide/images/WINREPRESSME-Capture2.png
 -share/samba/swat/help/Samba-Guide/images/WindowsXP-NullConnection.png
 -share/samba/swat/help/Samba-Guide/images/WindowsXP-UserConnection.png
 -share/samba/swat/help/Samba-Guide/images/XP-screen001.png
 -share/samba/swat/help/Samba-Guide/images/acct2net.png
 -share/samba/swat/help/Samba-Guide/images/ch7-dual-additive-LDAP-Ok.png
 -share/samba/swat/help/Samba-Guide/images/ch7-dual-additive-LDAP.png
 -share/samba/swat/help/Samba-Guide/images/ch7-fail-overLDAP.png
 -share/samba/swat/help/Samba-Guide/images/ch7-singleLDAP.png
 -share/samba/swat/help/Samba-Guide/images/ch8-migration.png
 -share/samba/swat/help/Samba-Guide/images/chap4-net.png
 -share/samba/swat/help/Samba-Guide/images/chap5-net.png
 -share/samba/swat/help/Samba-Guide/images/chap6-net.png
 -share/samba/swat/help/Samba-Guide/images/chap7-idresol.png
 -share/samba/swat/help/Samba-Guide/images/chap7-net-Ar.png
 -share/samba/swat/help/Samba-Guide/images/chap7-net2-Br.png
 -share/samba/swat/help/Samba-Guide/images/chap9-ADSDC.png
 -share/samba/swat/help/Samba-Guide/images/chap9-SambaDC.png
 -share/samba/swat/help/Samba-Guide/images/lam-config.png
 -share/samba/swat/help/Samba-Guide/images/lam-group-members.png
 -share/samba/swat/help/Samba-Guide/images/lam-groups.png
 -share/samba/swat/help/Samba-Guide/images/lam-hosts.png
 -share/samba/swat/help/Samba-Guide/images/lam-login.png
 -share/samba/swat/help/Samba-Guide/images/lam-users.png
 -share/samba/swat/help/Samba-Guide/images/openmag.png
 -share/samba/swat/help/Samba-Guide/images/wxpp001.png
 -share/samba/swat/help/Samba-Guide/images/wxpp004.png
 -share/samba/swat/help/Samba-Guide/images/wxpp006.png
 -share/samba/swat/help/Samba-Guide/images/wxpp007.png
 -share/samba/swat/help/Samba-Guide/images/wxpp008.png
 -share/samba/swat/help/Samba-Guide/index.html
 -share/samba/swat/help/Samba-Guide/ix01.html
 -share/samba/swat/help/Samba-Guide/kerberos.html
 -share/samba/swat/help/Samba-Guide/migration.html
 -share/samba/swat/help/Samba-Guide/nw4migration.html
 -share/samba/swat/help/Samba-Guide/pr01.html
 -share/samba/swat/help/Samba-Guide/pr02.html
 -share/samba/swat/help/Samba-Guide/pr03.html
 -share/samba/swat/help/Samba-Guide/preface.html
 -share/samba/swat/help/Samba-Guide/primer.html
 -share/samba/swat/help/Samba-Guide/secure.html
 -share/samba/swat/help/Samba-Guide/simple.html
 -share/samba/swat/help/Samba-Guide/small.html
 -share/samba/swat/help/Samba-Guide/unixclients.html
 -share/samba/swat/help/Samba-HOWTO-Collection/AccessControls.html
 -share/samba/swat/help/Samba-HOWTO-Collection/AdvancedNetworkManagement.html
 -share/samba/swat/help/Samba-HOWTO-Collection/Appendix.html
 -share/samba/swat/help/Samba-HOWTO-Collection/Backup.html
 -share/samba/swat/help/Samba-HOWTO-Collection/CUPS-printing.html
 -share/samba/swat/help/Samba-HOWTO-Collection/ClientConfig.html
 -share/samba/swat/help/Samba-HOWTO-Collection/DNSDHCP.html
 -share/samba/swat/help/Samba-HOWTO-Collection/FastStart.html
 -share/samba/swat/help/Samba-HOWTO-Collection/InterdomainTrusts.html
 -share/samba/swat/help/Samba-HOWTO-Collection/IntroSMB.html
 -share/samba/swat/help/Samba-HOWTO-Collection/NT4Migration.html
 -share/samba/swat/help/Samba-HOWTO-Collection/NetworkBrowsing.html
 -share/samba/swat/help/Samba-HOWTO-Collection/Other-Clients.html
 -share/samba/swat/help/Samba-HOWTO-Collection/PolicyMgmt.html
 -share/samba/swat/help/Samba-HOWTO-Collection/Portability.html
 -share/samba/swat/help/Samba-HOWTO-Collection/ProfileMgmt.html
 -share/samba/swat/help/Samba-HOWTO-Collection/SWAT.html
 -share/samba/swat/help/Samba-HOWTO-Collection/SambaHA.html
 -share/samba/swat/help/Samba-HOWTO-Collection/ServerType.html
 -share/samba/swat/help/Samba-HOWTO-Collection/StandAloneServer.html
 -share/samba/swat/help/Samba-HOWTO-Collection/VFS.html
 -share/samba/swat/help/Samba-HOWTO-Collection/bugreport.html
 -share/samba/swat/help/Samba-HOWTO-Collection/compiling.html
 -share/samba/swat/help/Samba-HOWTO-Collection/diagnosis.html
 -share/samba/swat/help/Samba-HOWTO-Collection/domain-member.html
 -share/samba/swat/help/Samba-HOWTO-Collection/go01.html
 -share/samba/swat/help/Samba-HOWTO-Collection/gpl.html
 -share/samba/swat/help/Samba-HOWTO-Collection/groupmapping.html
 -share/samba/swat/help/Samba-HOWTO-Collection/idmapper.html
 -share/samba/swat/help/Samba-HOWTO-Collection/images/10small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/11small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/12small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/13small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/14small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/1small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/2small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/3small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/4small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/5small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/6small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/7small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/8small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/9small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WME001.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WME002.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WME003.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WME005.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WME009.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WME010.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WME013.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WME014.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WXPP002.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WXPP003.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WXPP005.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WXPP009.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/WXPP014.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/a_small.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/access1.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/browsing1.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/cups1.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/cups2.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/domain.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/ethereal1.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/ethereal2.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/idmap-gid2sid.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/idmap-sid2gid.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/idmap-sid2uid.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/idmap-uid2sid.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/pdftoepsonusb.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/pdftosocket.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/trusts1.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/w2kp001.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/w2kp002.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/w2kp003.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/w2kp004.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/w2kp005.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/wxpp001.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/wxpp004.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/wxpp006.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/wxpp007.png
 -share/samba/swat/help/Samba-HOWTO-Collection/images/wxpp008.png
 -share/samba/swat/help/Samba-HOWTO-Collection/index.html
 -share/samba/swat/help/Samba-HOWTO-Collection/install.html
 -share/samba/swat/help/Samba-HOWTO-Collection/integrate-ms-networks.html
 -share/samba/swat/help/Samba-HOWTO-Collection/introduction.html
 -share/samba/swat/help/Samba-HOWTO-Collection/ix01.html
 -share/samba/swat/help/Samba-HOWTO-Collection/largefile.html
 -share/samba/swat/help/Samba-HOWTO-Collection/locking.html
 -share/samba/swat/help/Samba-HOWTO-Collection/migration.html
 -share/samba/swat/help/Samba-HOWTO-Collection/msdfs.html
 -share/samba/swat/help/Samba-HOWTO-Collection/optional.html
 -share/samba/swat/help/Samba-HOWTO-Collection/pam.html
 -share/samba/swat/help/Samba-HOWTO-Collection/passdb.html
 -share/samba/swat/help/Samba-HOWTO-Collection/pr01.html
 -share/samba/swat/help/Samba-HOWTO-Collection/pr02.html
 -share/samba/swat/help/Samba-HOWTO-Collection/pr03.html
 -share/samba/swat/help/Samba-HOWTO-Collection/printing.html
 -share/samba/swat/help/Samba-HOWTO-Collection/problems.html
 -share/samba/swat/help/Samba-HOWTO-Collection/rights.html
 -share/samba/swat/help/Samba-HOWTO-Collection/samba-bdc.html
 -share/samba/swat/help/Samba-HOWTO-Collection/samba-pdc.html
 -share/samba/swat/help/Samba-HOWTO-Collection/securing-samba.html
 -share/samba/swat/help/Samba-HOWTO-Collection/speed.html
 -share/samba/swat/help/Samba-HOWTO-Collection/troubleshooting.html
 -share/samba/swat/help/Samba-HOWTO-Collection/type.html
 -share/samba/swat/help/Samba-HOWTO-Collection/unicode.html
 -share/samba/swat/help/Samba-HOWTO-Collection/upgrading-to-3.0.html
 -share/samba/swat/help/Samba-HOWTO-Collection/winbind.html
 -share/samba/swat/help/editreg.1.html
 -share/samba/swat/help/findsmb.1.html
 -share/samba/swat/help/index.html
 -share/samba/swat/help/lmhosts.5.html
 -share/samba/swat/help/log2pcap.1.html
 -share/samba/swat/help/manpages.html
 -share/samba/swat/help/mount.cifs.8.html
 -share/samba/swat/help/net.8.html
 -share/samba/swat/help/nmbd.8.html
 -share/samba/swat/help/nmblookup.1.html
 -share/samba/swat/help/ntlm_auth.1.html
 -share/samba/swat/help/pam_winbind.8.html
 -share/samba/swat/help/pdbedit.8.html
 -share/samba/swat/help/profiles.1.html
 -share/samba/swat/help/rpcclient.1.html
 -share/samba/swat/help/samba.7.html
 -share/samba/swat/help/smb.conf.5.html
 -share/samba/swat/help/smbcacls.1.html
 -share/samba/swat/help/smbclient.1.html
 -share/samba/swat/help/smbcontrol.1.html
 -share/samba/swat/help/smbcquotas.1.html
 -share/samba/swat/help/smbd.8.html
 -share/samba/swat/help/smbget.1.html
 -share/samba/swat/help/smbgetrc.5.html
 -share/samba/swat/help/smbmnt.8.html
 -share/samba/swat/help/smbmount.8.html
 -share/samba/swat/help/smbpasswd.5.html
 -share/samba/swat/help/smbpasswd.8.html
 -share/samba/swat/help/smbsh.1.html
 -share/samba/swat/help/smbspool.8.html
 -share/samba/swat/help/smbstatus.1.html
 -share/samba/swat/help/smbtar.1.html
 -share/samba/swat/help/smbtree.1.html
 -share/samba/swat/help/smbumount.8.html
 -share/samba/swat/help/swat.8.html
 -share/samba/swat/help/tdbbackup.8.html
 -share/samba/swat/help/tdbdump.8.html
 -share/samba/swat/help/testparm.1.html
 -share/samba/swat/help/testprns.1.html
 -share/samba/swat/help/vfstest.1.html
 -share/samba/swat/help/wbinfo.1.html
 +share/samba/swat/help/Samba3-Developers-Guide/CodingSuggestions.html
 +share/samba/swat/help/Samba3-Developers-Guide/Packaging.html
 +share/samba/swat/help/Samba3-Developers-Guide/architecture.html
 +share/samba/swat/help/Samba3-Developers-Guide/contributing.html
 +share/samba/swat/help/Samba3-Developers-Guide/debug.html
 +share/samba/swat/help/Samba3-Developers-Guide/devprinting.html
 +share/samba/swat/help/Samba3-Developers-Guide/index.html
 +share/samba/swat/help/Samba3-Developers-Guide/internals.html
 +share/samba/swat/help/Samba3-Developers-Guide/modules.html
 +share/samba/swat/help/Samba3-Developers-Guide/ntdomain.html
 +share/samba/swat/help/Samba3-Developers-Guide/parsing.html
 +share/samba/swat/help/Samba3-Developers-Guide/pt01.html
 +share/samba/swat/help/Samba3-Developers-Guide/pt02.html
 +share/samba/swat/help/Samba3-Developers-Guide/pt03.html
 +share/samba/swat/help/Samba3-Developers-Guide/pt04.html
 +share/samba/swat/help/Samba3-Developers-Guide/pt05.html
 +share/samba/swat/help/Samba3-Developers-Guide/pwencrypt.html
 +share/samba/swat/help/Samba3-Developers-Guide/rpc-plugin.html
 +share/samba/swat/help/Samba3-Developers-Guide/tracing.html
 +share/samba/swat/help/Samba3-Developers-Guide/unix-smb.html
 +share/samba/swat/help/Samba3-Developers-Guide/vfs.html
 +share/samba/swat/help/Samba3-Developers-Guide/wins.html
 +share/samba/swat/help/Samba3-ByExample/2000users.html
 +share/samba/swat/help/Samba3-ByExample/Big500users.html
 +share/samba/swat/help/Samba3-ByExample/DMSMig.html
 +share/samba/swat/help/Samba3-ByExample/DomApps.html
 +share/samba/swat/help/Samba3-ByExample/ExNetworks.html
 +share/samba/swat/help/Samba3-ByExample/HA.html
 +share/samba/swat/help/Samba3-ByExample/RefSection.html
 +share/samba/swat/help/Samba3-ByExample/appendix.html
 +share/samba/swat/help/Samba3-ByExample/ch14.html
 +share/samba/swat/help/Samba3-ByExample/go01.html
 +share/samba/swat/help/Samba3-ByExample/gpl.html
 +share/samba/swat/help/Samba3-ByExample/happy.html
 +share/samba/swat/help/Samba3-ByExample/images/AccountingNetwork.png
 +share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png
 +share/samba/swat/help/Samba3-ByExample/images/HostAnnouncment.png
 +share/samba/swat/help/Samba3-ByExample/images/NullConnect.png
 +share/samba/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
 +share/samba/swat/help/Samba3-ByExample/images/UserConnect.png
 +share/samba/swat/help/Samba3-ByExample/images/UserMgrNT4.png
 +share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
 +share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
 +share/samba/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
 +share/samba/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
 +share/samba/swat/help/Samba3-ByExample/images/XP-screen001.png
 +share/samba/swat/help/Samba3-ByExample/images/acct2net.png
 +share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
 +share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
 +share/samba/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
 +share/samba/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
 +share/samba/swat/help/Samba3-ByExample/images/ch8-migration.png
 +share/samba/swat/help/Samba3-ByExample/images/chap4-net.png
 +share/samba/swat/help/Samba3-ByExample/images/chap5-net.png
 +share/samba/swat/help/Samba3-ByExample/images/chap6-net.png
 +share/samba/swat/help/Samba3-ByExample/images/chap7-idresol.png
 +share/samba/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
 +share/samba/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
 +share/samba/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
 +share/samba/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
 +share/samba/swat/help/Samba3-ByExample/images/imc-usermanager2.png
 +share/samba/swat/help/Samba3-ByExample/images/lam-config.png
 +share/samba/swat/help/Samba3-ByExample/images/lam-group-members.png
 +share/samba/swat/help/Samba3-ByExample/images/lam-groups.png
 +share/samba/swat/help/Samba3-ByExample/images/lam-hosts.png
 +share/samba/swat/help/Samba3-ByExample/images/lam-login.png
 +share/samba/swat/help/Samba3-ByExample/images/lam-users.png
 +share/samba/swat/help/Samba3-ByExample/images/openmag.png
 +share/samba/swat/help/Samba3-ByExample/images/wxpp001.png
 +share/samba/swat/help/Samba3-ByExample/images/wxpp004.png
 +share/samba/swat/help/Samba3-ByExample/images/wxpp006.png
 +share/samba/swat/help/Samba3-ByExample/images/wxpp007.png
 +share/samba/swat/help/Samba3-ByExample/images/wxpp008.png
 +share/samba/swat/help/Samba3-ByExample/index.html
 +share/samba/swat/help/Samba3-ByExample/ix01.html
 +share/samba/swat/help/Samba3-ByExample/kerberos.html
 +share/samba/swat/help/Samba3-ByExample/ntmigration.html
 +share/samba/swat/help/Samba3-ByExample/nw4migration.html
 +share/samba/swat/help/Samba3-ByExample/pr01.html
 +share/samba/swat/help/Samba3-ByExample/pr02.html
 +share/samba/swat/help/Samba3-ByExample/pr03.html
 +share/samba/swat/help/Samba3-ByExample/preface.html
 +share/samba/swat/help/Samba3-ByExample/primer.html
 +share/samba/swat/help/Samba3-ByExample/secure.html
 +share/samba/swat/help/Samba3-ByExample/simple.html
 +share/samba/swat/help/Samba3-ByExample/small.html
 +share/samba/swat/help/Samba3-ByExample/unixclients.html
 +share/samba/swat/help/Samba3-ByExample/upgrades.html
 +share/samba/swat/help/Samba3-HOWTO/AccessControls.html
 +share/samba/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html
 +share/samba/swat/help/Samba3-HOWTO/Appendix.html
 +share/samba/swat/help/Samba3-HOWTO/Backup.html
 +share/samba/swat/help/Samba3-HOWTO/CUPS-printing.html
 +share/samba/swat/help/Samba3-HOWTO/ClientConfig.html
 +share/samba/swat/help/Samba3-HOWTO/DNSDHCP.html
 +share/samba/swat/help/Samba3-HOWTO/FastStart.html
 +share/samba/swat/help/Samba3-HOWTO/InterdomainTrusts.html
 +share/samba/swat/help/Samba3-HOWTO/IntroSMB.html
 +share/samba/swat/help/Samba3-HOWTO/NT4Migration.html
 +share/samba/swat/help/Samba3-HOWTO/NetCommand.html
 +share/samba/swat/help/Samba3-HOWTO/NetworkBrowsing.html
 +share/samba/swat/help/Samba3-HOWTO/Other-Clients.html
 +share/samba/swat/help/Samba3-HOWTO/PolicyMgmt.html
 +share/samba/swat/help/Samba3-HOWTO/Portability.html
 +share/samba/swat/help/Samba3-HOWTO/ProfileMgmt.html
 +share/samba/swat/help/Samba3-HOWTO/SWAT.html
 +share/samba/swat/help/Samba3-HOWTO/SambaHA.html
 +share/samba/swat/help/Samba3-HOWTO/ServerType.html
 +share/samba/swat/help/Samba3-HOWTO/StandAloneServer.html
 +share/samba/swat/help/Samba3-HOWTO/TOSHpreface.html
 +share/samba/swat/help/Samba3-HOWTO/VFS.html
 +share/samba/swat/help/Samba3-HOWTO/bugreport.html
 +share/samba/swat/help/Samba3-HOWTO/cfgsmarts.html
 +share/samba/swat/help/Samba3-HOWTO/ch-ldap-tls.html
 +share/samba/swat/help/Samba3-HOWTO/ch45.html
 +share/samba/swat/help/Samba3-HOWTO/classicalprinting.html
 +share/samba/swat/help/Samba3-HOWTO/compiling.html
 +share/samba/swat/help/Samba3-HOWTO/diagnosis.html
 +share/samba/swat/help/Samba3-HOWTO/domain-member.html
 +share/samba/swat/help/Samba3-HOWTO/go01.html
 +share/samba/swat/help/Samba3-HOWTO/gpl.html
 +share/samba/swat/help/Samba3-HOWTO/groupmapping.html
 +share/samba/swat/help/Samba3-HOWTO/idmapper.html
 +share/samba/swat/help/Samba3-HOWTO/images/10small.png
 +share/samba/swat/help/Samba3-HOWTO/images/11small.png
 +share/samba/swat/help/Samba3-HOWTO/images/12small.png
 +share/samba/swat/help/Samba3-HOWTO/images/13small.png
 +share/samba/swat/help/Samba3-HOWTO/images/14small.png
 +share/samba/swat/help/Samba3-HOWTO/images/1small.png
 +share/samba/swat/help/Samba3-HOWTO/images/2small.png
 +share/samba/swat/help/Samba3-HOWTO/images/3small.png
 +share/samba/swat/help/Samba3-HOWTO/images/4small.png
 +share/samba/swat/help/Samba3-HOWTO/images/5small.png
 +share/samba/swat/help/Samba3-HOWTO/images/6small.png
 +share/samba/swat/help/Samba3-HOWTO/images/7small.png
 +share/samba/swat/help/Samba3-HOWTO/images/8small.png
 +share/samba/swat/help/Samba3-HOWTO/images/9small.png
 +share/samba/swat/help/Samba3-HOWTO/images/WME001.png
 +share/samba/swat/help/Samba3-HOWTO/images/WME002.png
 +share/samba/swat/help/Samba3-HOWTO/images/WME003.png
 +share/samba/swat/help/Samba3-HOWTO/images/WME005.png
 +share/samba/swat/help/Samba3-HOWTO/images/WME009.png
 +share/samba/swat/help/Samba3-HOWTO/images/WME010.png
 +share/samba/swat/help/Samba3-HOWTO/images/WME013.png
 +share/samba/swat/help/Samba3-HOWTO/images/WME014.png
 +share/samba/swat/help/Samba3-HOWTO/images/WXPP002.png
 +share/samba/swat/help/Samba3-HOWTO/images/WXPP003.png
 +share/samba/swat/help/Samba3-HOWTO/images/WXPP005.png
 +share/samba/swat/help/Samba3-HOWTO/images/WXPP009.png
 +share/samba/swat/help/Samba3-HOWTO/images/WXPP014.png
 +share/samba/swat/help/Samba3-HOWTO/images/a_small.png
 +share/samba/swat/help/Samba3-HOWTO/images/access1.png
 +share/samba/swat/help/Samba3-HOWTO/images/browsing1.png
 +share/samba/swat/help/Samba3-HOWTO/images/cups1.png
 +share/samba/swat/help/Samba3-HOWTO/images/cups2.png
 +share/samba/swat/help/Samba3-HOWTO/images/domain.png
 +share/samba/swat/help/Samba3-HOWTO/images/ethereal1.png
 +share/samba/swat/help/Samba3-HOWTO/images/ethereal2.png
 +share/samba/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
 +share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
 +share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
 +share/samba/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
 +share/samba/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
 +share/samba/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
 +share/samba/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
 +share/samba/swat/help/Samba3-HOWTO/images/pdftosocket.png
 +share/samba/swat/help/Samba3-HOWTO/images/trusts1.png
 +share/samba/swat/help/Samba3-HOWTO/images/w2kp001.png
 +share/samba/swat/help/Samba3-HOWTO/images/w2kp002.png
 +share/samba/swat/help/Samba3-HOWTO/images/w2kp003.png
 +share/samba/swat/help/Samba3-HOWTO/images/w2kp004.png
 +share/samba/swat/help/Samba3-HOWTO/images/w2kp005.png
 +share/samba/swat/help/Samba3-HOWTO/images/wxpp001.png
 +share/samba/swat/help/Samba3-HOWTO/images/wxpp004.png
 +share/samba/swat/help/Samba3-HOWTO/images/wxpp006.png
 +share/samba/swat/help/Samba3-HOWTO/images/wxpp007.png
 +share/samba/swat/help/Samba3-HOWTO/images/wxpp008.png
 +share/samba/swat/help/Samba3-HOWTO/index.html
 +share/samba/swat/help/Samba3-HOWTO/install.html
 +share/samba/swat/help/Samba3-HOWTO/integrate-ms-networks.html
 +share/samba/swat/help/Samba3-HOWTO/introduction.html
 +share/samba/swat/help/Samba3-HOWTO/ix01.html
 +share/samba/swat/help/Samba3-HOWTO/largefile.html
 +share/samba/swat/help/Samba3-HOWTO/locking.html
 +share/samba/swat/help/Samba3-HOWTO/migration.html
 +share/samba/swat/help/Samba3-HOWTO/msdfs.html
 +share/samba/swat/help/Samba3-HOWTO/optional.html
 +share/samba/swat/help/Samba3-HOWTO/pam.html
 +share/samba/swat/help/Samba3-HOWTO/passdb.html
 +share/samba/swat/help/Samba3-HOWTO/pr01.html
 +share/samba/swat/help/Samba3-HOWTO/pr02.html
 +share/samba/swat/help/Samba3-HOWTO/pr03.html
 +share/samba/swat/help/Samba3-HOWTO/problems.html
 +share/samba/swat/help/Samba3-HOWTO/rights.html
 +share/samba/swat/help/Samba3-HOWTO/samba-bdc.html
 +share/samba/swat/help/Samba3-HOWTO/samba-pdc.html
 +share/samba/swat/help/Samba3-HOWTO/securing-samba.html
 +share/samba/swat/help/Samba3-HOWTO/speed.html
 +share/samba/swat/help/Samba3-HOWTO/troubleshooting.html
 +share/samba/swat/help/Samba3-HOWTO/type.html
 +share/samba/swat/help/Samba3-HOWTO/unicode.html
 +share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
 +share/samba/swat/help/Samba3-HOWTO/winbind.html
 +share/samba/swat/help/manpages/editreg.1.html
 +share/samba/swat/help/manpages/findsmb.1.html
 +share/samba/swat/help/manpages/index.html
 +share/samba/swat/help/manpages/libsmbclient.8.html
 +share/samba/swat/help/manpages/lmhosts.5.html
 +share/samba/swat/help/manpages/log2pcap.1.html
 +share/samba/swat/help/manpages/mount.cifs.8.html
 +share/samba/swat/help/manpages/net.8.html
 +share/samba/swat/help/manpages/nmbd.8.html
 +share/samba/swat/help/manpages/nmblookup.1.html
 +share/samba/swat/help/manpages/ntlm_auth.1.html
 +share/samba/swat/help/manpages/pam_winbind.8.html
 +share/samba/swat/help/manpages/pdbedit.8.html
 +share/samba/swat/help/manpages/profiles.1.html
 +share/samba/swat/help/manpages/rpcclient.1.html
 +share/samba/swat/help/manpages/samba.7.html
 +share/samba/swat/help/manpages/smb.conf.5.html
 +share/samba/swat/help/manpages/smbcacls.1.html
 +share/samba/swat/help/manpages/smbclient.1.html
 +share/samba/swat/help/manpages/smbcontrol.1.html
 +share/samba/swat/help/manpages/smbcquotas.1.html
 +share/samba/swat/help/manpages/smbd.8.html
 +share/samba/swat/help/manpages/smbget.1.html
 +share/samba/swat/help/manpages/smbgetrc.5.html
 +share/samba/swat/help/manpages/smbmnt.8.html
 +share/samba/swat/help/manpages/smbmount.8.html
 +share/samba/swat/help/manpages/smbpasswd.5.html
 +share/samba/swat/help/manpages/smbpasswd.8.html
 +share/samba/swat/help/manpages/smbsh.1.html
 +share/samba/swat/help/manpages/smbspool.8.html
 +share/samba/swat/help/manpages/smbstatus.1.html
 +share/samba/swat/help/manpages/smbtar.1.html
 +share/samba/swat/help/manpages/smbtree.1.html
 +share/samba/swat/help/manpages/smbumount.8.html
 +share/samba/swat/help/manpages/swat.8.html
 +share/samba/swat/help/manpages/tdbbackup.8.html
 +share/samba/swat/help/manpages/tdbdump.8.html
 +share/samba/swat/help/manpages/testparm.1.html
 +share/samba/swat/help/manpages/testprns.1.html
 +share/samba/swat/help/manpages/umount.cifs.8.html
 +share/samba/swat/help/manpages/vfstest.1.html
 +share/samba/swat/help/manpages/wbinfo.1.html
 +share/samba/swat/help/manpages/winbindd.8.html
  share/samba/swat/help/welcome.html
 -share/samba/swat/help/winbindd.8.html
  share/samba/swat/images/globals.gif
  share/samba/swat/images/home.gif
  share/samba/swat/images/passwd.gif
 @@ -391,171 +402,171 @@
  share/samba/swat/lang/tr/images/shares.gif
  share/samba/swat/lang/tr/images/status.gif
  share/samba/swat/lang/tr/images/viewconfig.gif
 -share/samba/swat/using_samba/appa.html
 -share/samba/swat/using_samba/appb.html
 -share/samba/swat/using_samba/appc.html
 -share/samba/swat/using_samba/appd.html
 -share/samba/swat/using_samba/appe.html
 -share/samba/swat/using_samba/appf.html
 -share/samba/swat/using_samba/appg.html
 -share/samba/swat/using_samba/ch00.html
 -share/samba/swat/using_samba/ch01.html
 -share/samba/swat/using_samba/ch02.html
 -share/samba/swat/using_samba/ch03.html
 -share/samba/swat/using_samba/ch04.html
 -share/samba/swat/using_samba/ch05.html
 -share/samba/swat/using_samba/ch06.html
 -share/samba/swat/using_samba/ch07.html
 -share/samba/swat/using_samba/ch08.html
 -share/samba/swat/using_samba/ch09.html
 -share/samba/swat/using_samba/ch10.html
 -share/samba/swat/using_samba/ch11.html
 -share/samba/swat/using_samba/ch12.html
 -share/samba/swat/using_samba/figs/sam2_0101.gif
 -share/samba/swat/using_samba/figs/sam2_0102.gif
 -share/samba/swat/using_samba/figs/sam2_0103.gif
 -share/samba/swat/using_samba/figs/sam2_0104.gif
 -share/samba/swat/using_samba/figs/sam2_0105.gif
 -share/samba/swat/using_samba/figs/sam2_0106.gif
 -share/samba/swat/using_samba/figs/sam2_0107.gif
 -share/samba/swat/using_samba/figs/sam2_0108.gif
 -share/samba/swat/using_samba/figs/sam2_0109.gif
 -share/samba/swat/using_samba/figs/sam2_0110.gif
 -share/samba/swat/using_samba/figs/sam2_0111.gif
 -share/samba/swat/using_samba/figs/sam2_0112.gif
 -share/samba/swat/using_samba/figs/sam2_0113.gif
 -share/samba/swat/using_samba/figs/sam2_0114.gif
 -share/samba/swat/using_samba/figs/sam2_0201.gif
 -share/samba/swat/using_samba/figs/sam2_0202.gif
 -share/samba/swat/using_samba/figs/sam2_0203.gif
 -share/samba/swat/using_samba/figs/sam2_0204.gif
 -share/samba/swat/using_samba/figs/sam2_0301.gif
 -share/samba/swat/using_samba/figs/sam2_0302.gif
 -share/samba/swat/using_samba/figs/sam2_0303.gif
 -share/samba/swat/using_samba/figs/sam2_0304.gif
 -share/samba/swat/using_samba/figs/sam2_0305.gif
 -share/samba/swat/using_samba/figs/sam2_0306.gif
 -share/samba/swat/using_samba/figs/sam2_0307.gif
 -share/samba/swat/using_samba/figs/sam2_0308.gif
 -share/samba/swat/using_samba/figs/sam2_0309.gif
 -share/samba/swat/using_samba/figs/sam2_0310.gif
 -share/samba/swat/using_samba/figs/sam2_0311.gif
 -share/samba/swat/using_samba/figs/sam2_0312.gif
 -share/samba/swat/using_samba/figs/sam2_0313.gif
 -share/samba/swat/using_samba/figs/sam2_0314.gif
 -share/samba/swat/using_samba/figs/sam2_0315.gif
 -share/samba/swat/using_samba/figs/sam2_0316.gif
 -share/samba/swat/using_samba/figs/sam2_0317.gif
 -share/samba/swat/using_samba/figs/sam2_0318.gif
 -share/samba/swat/using_samba/figs/sam2_0319.gif
 -share/samba/swat/using_samba/figs/sam2_0320.gif
 -share/samba/swat/using_samba/figs/sam2_0321.gif
 -share/samba/swat/using_samba/figs/sam2_0322.gif
 -share/samba/swat/using_samba/figs/sam2_0323.gif
 -share/samba/swat/using_samba/figs/sam2_0324.gif
 -share/samba/swat/using_samba/figs/sam2_0325.gif
 -share/samba/swat/using_samba/figs/sam2_0326.gif
 -share/samba/swat/using_samba/figs/sam2_0327.gif
 -share/samba/swat/using_samba/figs/sam2_0328.gif
 -share/samba/swat/using_samba/figs/sam2_0329.gif
 -share/samba/swat/using_samba/figs/sam2_0330.gif
 -share/samba/swat/using_samba/figs/sam2_0331.gif
 -share/samba/swat/using_samba/figs/sam2_0332.gif
 -share/samba/swat/using_samba/figs/sam2_0333.gif
 -share/samba/swat/using_samba/figs/sam2_0334.gif
 -share/samba/swat/using_samba/figs/sam2_0335.gif
 -share/samba/swat/using_samba/figs/sam2_0336.gif
 -share/samba/swat/using_samba/figs/sam2_0337.gif
 -share/samba/swat/using_samba/figs/sam2_0338.gif
 -share/samba/swat/using_samba/figs/sam2_0339.gif
 -share/samba/swat/using_samba/figs/sam2_0340.gif
 -share/samba/swat/using_samba/figs/sam2_0341.gif
 -share/samba/swat/using_samba/figs/sam2_0342.gif
 -share/samba/swat/using_samba/figs/sam2_0343.gif
 -share/samba/swat/using_samba/figs/sam2_0344.gif
 -share/samba/swat/using_samba/figs/sam2_0345.gif
 -share/samba/swat/using_samba/figs/sam2_0346.gif
 -share/samba/swat/using_samba/figs/sam2_0347.gif
 -share/samba/swat/using_samba/figs/sam2_0348.gif
 -share/samba/swat/using_samba/figs/sam2_0349.gif
 -share/samba/swat/using_samba/figs/sam2_0350.gif
 -share/samba/swat/using_samba/figs/sam2_0351.gif
 -share/samba/swat/using_samba/figs/sam2_0352.gif
 -share/samba/swat/using_samba/figs/sam2_0353.gif
 -share/samba/swat/using_samba/figs/sam2_0354.gif
 -share/samba/swat/using_samba/figs/sam2_0355.gif
 -share/samba/swat/using_samba/figs/sam2_0356.gif
 -share/samba/swat/using_samba/figs/sam2_0357.gif
 -share/samba/swat/using_samba/figs/sam2_0358.gif
 -share/samba/swat/using_samba/figs/sam2_0359.gif
 -share/samba/swat/using_samba/figs/sam2_0360.gif
 -share/samba/swat/using_samba/figs/sam2_0361.gif
 -share/samba/swat/using_samba/figs/sam2_0401.gif
 -share/samba/swat/using_samba/figs/sam2_0402.gif
 -share/samba/swat/using_samba/figs/sam2_0403.gif
 -share/samba/swat/using_samba/figs/sam2_0404.gif
 -share/samba/swat/using_samba/figs/sam2_0405.gif
 -share/samba/swat/using_samba/figs/sam2_0406.gif
 -share/samba/swat/using_samba/figs/sam2_0407.gif
 -share/samba/swat/using_samba/figs/sam2_0408.gif
 -share/samba/swat/using_samba/figs/sam2_0409.gif
 -share/samba/swat/using_samba/figs/sam2_0410.gif
 -share/samba/swat/using_samba/figs/sam2_0411.gif
 -share/samba/swat/using_samba/figs/sam2_0412.gif
 -share/samba/swat/using_samba/figs/sam2_0413.gif
 -share/samba/swat/using_samba/figs/sam2_0414.gif
 -share/samba/swat/using_samba/figs/sam2_0415.gif
 -share/samba/swat/using_samba/figs/sam2_0416.gif
 -share/samba/swat/using_samba/figs/sam2_0417.gif
 -share/samba/swat/using_samba/figs/sam2_0501.gif
 -share/samba/swat/using_samba/figs/sam2_0502.gif
 -share/samba/swat/using_samba/figs/sam2_0503.gif
 -share/samba/swat/using_samba/figs/sam2_0504.gif
 -share/samba/swat/using_samba/figs/sam2_0505.gif
 -share/samba/swat/using_samba/figs/sam2_0506.gif
 -share/samba/swat/using_samba/figs/sam2_0507.gif
 -share/samba/swat/using_samba/figs/sam2_0508.gif
 -share/samba/swat/using_samba/figs/sam2_0601.gif
 -share/samba/swat/using_samba/figs/sam2_0602.gif
 -share/samba/swat/using_samba/figs/sam2_0603.gif
 -share/samba/swat/using_samba/figs/sam2_0604.gif
 -share/samba/swat/using_samba/figs/sam2_0605.gif
 -share/samba/swat/using_samba/figs/sam2_0701.gif
 -share/samba/swat/using_samba/figs/sam2_0801.gif
 -share/samba/swat/using_samba/figs/sam2_0802.gif
 -share/samba/swat/using_samba/figs/sam2_0803.gif
 -share/samba/swat/using_samba/figs/sam2_0804.gif
 -share/samba/swat/using_samba/figs/sam2_0805.gif
 -share/samba/swat/using_samba/figs/sam2_0806.gif
 -share/samba/swat/using_samba/figs/sam2_0807.gif
 -share/samba/swat/using_samba/figs/sam2_0808.gif
 -share/samba/swat/using_samba/figs/sam2_0809.gif
 -share/samba/swat/using_samba/figs/sam2_0810.gif
 -share/samba/swat/using_samba/figs/sam2_0811.gif
 -share/samba/swat/using_samba/figs/sam2_0901.gif
 -share/samba/swat/using_samba/figs/sam2_0902.gif
 -share/samba/swat/using_samba/figs/sam2_0903.gif
 -share/samba/swat/using_samba/figs/sam2_1001.gif
 -share/samba/swat/using_samba/figs/sam2_1002.gif
 -share/samba/swat/using_samba/figs/sam2_1003.gif
 -share/samba/swat/using_samba/figs/sam2_1004.gif
 -share/samba/swat/using_samba/figs/sam2_1005.gif
 -share/samba/swat/using_samba/figs/sam2_1006.gif
 -share/samba/swat/using_samba/figs/sam2_1101.gif
 -share/samba/swat/using_samba/figs/sam2_1102.gif
 -share/samba/swat/using_samba/figs/sam2_af01.gif
 -share/samba/swat/using_samba/figs/sam2_af02.gif
 -share/samba/swat/using_samba/figs/sam2_af03.gif
 -share/samba/swat/using_samba/figs/sam2_af04.gif
 -share/samba/swat/using_samba/figs/sam2_af05.gif
 -share/samba/swat/using_samba/figs/sam2_af06.gif
 -share/samba/swat/using_samba/figs/sam2_af07.gif
 -share/samba/swat/using_samba/inx.html
 -share/samba/swat/using_samba/samba2_s.gif
 -share/samba/swat/using_samba/samba2_xs.gif
 -share/samba/swat/using_samba/toc.html
 -@dirrm share/samba/swat/using_samba/figs
 -@dirrm share/samba/swat/using_samba
 +share/samba/swat/help/using_samba/appa.html
 +share/samba/swat/help/using_samba/appb.html
 +share/samba/swat/help/using_samba/appc.html
 +share/samba/swat/help/using_samba/appd.html
 +share/samba/swat/help/using_samba/appe.html
 +share/samba/swat/help/using_samba/appf.html
 +share/samba/swat/help/using_samba/appg.html
 +share/samba/swat/help/using_samba/ch00.html
 +share/samba/swat/help/using_samba/ch01.html
 +share/samba/swat/help/using_samba/ch02.html
 +share/samba/swat/help/using_samba/ch03.html
 +share/samba/swat/help/using_samba/ch04.html
 +share/samba/swat/help/using_samba/ch05.html
 +share/samba/swat/help/using_samba/ch06.html
 +share/samba/swat/help/using_samba/ch07.html
 +share/samba/swat/help/using_samba/ch08.html
 +share/samba/swat/help/using_samba/ch09.html
 +share/samba/swat/help/using_samba/ch10.html
 +share/samba/swat/help/using_samba/ch11.html
 +share/samba/swat/help/using_samba/ch12.html
 +share/samba/swat/help/using_samba/figs/sam2_0101.gif
 +share/samba/swat/help/using_samba/figs/sam2_0102.gif
 +share/samba/swat/help/using_samba/figs/sam2_0103.gif
 +share/samba/swat/help/using_samba/figs/sam2_0104.gif
 +share/samba/swat/help/using_samba/figs/sam2_0105.gif
 +share/samba/swat/help/using_samba/figs/sam2_0106.gif
 +share/samba/swat/help/using_samba/figs/sam2_0107.gif
 +share/samba/swat/help/using_samba/figs/sam2_0108.gif
 +share/samba/swat/help/using_samba/figs/sam2_0109.gif
 +share/samba/swat/help/using_samba/figs/sam2_0110.gif
 +share/samba/swat/help/using_samba/figs/sam2_0111.gif
 +share/samba/swat/help/using_samba/figs/sam2_0112.gif
 +share/samba/swat/help/using_samba/figs/sam2_0113.gif
 +share/samba/swat/help/using_samba/figs/sam2_0114.gif
 +share/samba/swat/help/using_samba/figs/sam2_0201.gif
 +share/samba/swat/help/using_samba/figs/sam2_0202.gif
 +share/samba/swat/help/using_samba/figs/sam2_0203.gif
 +share/samba/swat/help/using_samba/figs/sam2_0204.gif
 +share/samba/swat/help/using_samba/figs/sam2_0301.gif
 +share/samba/swat/help/using_samba/figs/sam2_0302.gif
 +share/samba/swat/help/using_samba/figs/sam2_0303.gif
 +share/samba/swat/help/using_samba/figs/sam2_0304.gif
 +share/samba/swat/help/using_samba/figs/sam2_0305.gif
 +share/samba/swat/help/using_samba/figs/sam2_0306.gif
 +share/samba/swat/help/using_samba/figs/sam2_0307.gif
 +share/samba/swat/help/using_samba/figs/sam2_0308.gif
 +share/samba/swat/help/using_samba/figs/sam2_0309.gif
 +share/samba/swat/help/using_samba/figs/sam2_0310.gif
 +share/samba/swat/help/using_samba/figs/sam2_0311.gif
 +share/samba/swat/help/using_samba/figs/sam2_0312.gif
 +share/samba/swat/help/using_samba/figs/sam2_0313.gif
 +share/samba/swat/help/using_samba/figs/sam2_0314.gif
 +share/samba/swat/help/using_samba/figs/sam2_0315.gif
 +share/samba/swat/help/using_samba/figs/sam2_0316.gif
 +share/samba/swat/help/using_samba/figs/sam2_0317.gif
 +share/samba/swat/help/using_samba/figs/sam2_0318.gif
 +share/samba/swat/help/using_samba/figs/sam2_0319.gif
 +share/samba/swat/help/using_samba/figs/sam2_0320.gif
 +share/samba/swat/help/using_samba/figs/sam2_0321.gif
 +share/samba/swat/help/using_samba/figs/sam2_0322.gif
 +share/samba/swat/help/using_samba/figs/sam2_0323.gif
 +share/samba/swat/help/using_samba/figs/sam2_0324.gif
 +share/samba/swat/help/using_samba/figs/sam2_0325.gif
 +share/samba/swat/help/using_samba/figs/sam2_0326.gif
 +share/samba/swat/help/using_samba/figs/sam2_0327.gif
 +share/samba/swat/help/using_samba/figs/sam2_0328.gif
 +share/samba/swat/help/using_samba/figs/sam2_0329.gif
 +share/samba/swat/help/using_samba/figs/sam2_0330.gif
 +share/samba/swat/help/using_samba/figs/sam2_0331.gif
 +share/samba/swat/help/using_samba/figs/sam2_0332.gif
 +share/samba/swat/help/using_samba/figs/sam2_0333.gif
 +share/samba/swat/help/using_samba/figs/sam2_0334.gif
 +share/samba/swat/help/using_samba/figs/sam2_0335.gif
 +share/samba/swat/help/using_samba/figs/sam2_0336.gif
 +share/samba/swat/help/using_samba/figs/sam2_0337.gif
 +share/samba/swat/help/using_samba/figs/sam2_0338.gif
 +share/samba/swat/help/using_samba/figs/sam2_0339.gif
 +share/samba/swat/help/using_samba/figs/sam2_0340.gif
 +share/samba/swat/help/using_samba/figs/sam2_0341.gif
 +share/samba/swat/help/using_samba/figs/sam2_0342.gif
 +share/samba/swat/help/using_samba/figs/sam2_0343.gif
 +share/samba/swat/help/using_samba/figs/sam2_0344.gif
 +share/samba/swat/help/using_samba/figs/sam2_0345.gif
 +share/samba/swat/help/using_samba/figs/sam2_0346.gif
 +share/samba/swat/help/using_samba/figs/sam2_0347.gif
 +share/samba/swat/help/using_samba/figs/sam2_0348.gif
 +share/samba/swat/help/using_samba/figs/sam2_0349.gif
 +share/samba/swat/help/using_samba/figs/sam2_0350.gif
 +share/samba/swat/help/using_samba/figs/sam2_0351.gif
 +share/samba/swat/help/using_samba/figs/sam2_0352.gif
 +share/samba/swat/help/using_samba/figs/sam2_0353.gif
 +share/samba/swat/help/using_samba/figs/sam2_0354.gif
 +share/samba/swat/help/using_samba/figs/sam2_0355.gif
 +share/samba/swat/help/using_samba/figs/sam2_0356.gif
 +share/samba/swat/help/using_samba/figs/sam2_0357.gif
 +share/samba/swat/help/using_samba/figs/sam2_0358.gif
 +share/samba/swat/help/using_samba/figs/sam2_0359.gif
 +share/samba/swat/help/using_samba/figs/sam2_0360.gif
 +share/samba/swat/help/using_samba/figs/sam2_0361.gif
 +share/samba/swat/help/using_samba/figs/sam2_0401.gif
 +share/samba/swat/help/using_samba/figs/sam2_0402.gif
 +share/samba/swat/help/using_samba/figs/sam2_0403.gif
 +share/samba/swat/help/using_samba/figs/sam2_0404.gif
 +share/samba/swat/help/using_samba/figs/sam2_0405.gif
 +share/samba/swat/help/using_samba/figs/sam2_0406.gif
 +share/samba/swat/help/using_samba/figs/sam2_0407.gif
 +share/samba/swat/help/using_samba/figs/sam2_0408.gif
 +share/samba/swat/help/using_samba/figs/sam2_0409.gif
 +share/samba/swat/help/using_samba/figs/sam2_0410.gif
 +share/samba/swat/help/using_samba/figs/sam2_0411.gif
 +share/samba/swat/help/using_samba/figs/sam2_0412.gif
 +share/samba/swat/help/using_samba/figs/sam2_0413.gif
 +share/samba/swat/help/using_samba/figs/sam2_0414.gif
 +share/samba/swat/help/using_samba/figs/sam2_0415.gif
 +share/samba/swat/help/using_samba/figs/sam2_0416.gif
 +share/samba/swat/help/using_samba/figs/sam2_0417.gif
 +share/samba/swat/help/using_samba/figs/sam2_0501.gif
 +share/samba/swat/help/using_samba/figs/sam2_0502.gif
 +share/samba/swat/help/using_samba/figs/sam2_0503.gif
 +share/samba/swat/help/using_samba/figs/sam2_0504.gif
 +share/samba/swat/help/using_samba/figs/sam2_0505.gif
 +share/samba/swat/help/using_samba/figs/sam2_0506.gif
 +share/samba/swat/help/using_samba/figs/sam2_0507.gif
 +share/samba/swat/help/using_samba/figs/sam2_0508.gif
 +share/samba/swat/help/using_samba/figs/sam2_0601.gif
 +share/samba/swat/help/using_samba/figs/sam2_0602.gif
 +share/samba/swat/help/using_samba/figs/sam2_0603.gif
 +share/samba/swat/help/using_samba/figs/sam2_0604.gif
 +share/samba/swat/help/using_samba/figs/sam2_0605.gif
 +share/samba/swat/help/using_samba/figs/sam2_0701.gif
 +share/samba/swat/help/using_samba/figs/sam2_0801.gif
 +share/samba/swat/help/using_samba/figs/sam2_0802.gif
 +share/samba/swat/help/using_samba/figs/sam2_0803.gif
 +share/samba/swat/help/using_samba/figs/sam2_0804.gif
 +share/samba/swat/help/using_samba/figs/sam2_0805.gif
 +share/samba/swat/help/using_samba/figs/sam2_0806.gif
 +share/samba/swat/help/using_samba/figs/sam2_0807.gif
 +share/samba/swat/help/using_samba/figs/sam2_0808.gif
 +share/samba/swat/help/using_samba/figs/sam2_0809.gif
 +share/samba/swat/help/using_samba/figs/sam2_0810.gif
 +share/samba/swat/help/using_samba/figs/sam2_0811.gif
 +share/samba/swat/help/using_samba/figs/sam2_0901.gif
 +share/samba/swat/help/using_samba/figs/sam2_0902.gif
 +share/samba/swat/help/using_samba/figs/sam2_0903.gif
 +share/samba/swat/help/using_samba/figs/sam2_1001.gif
 +share/samba/swat/help/using_samba/figs/sam2_1002.gif
 +share/samba/swat/help/using_samba/figs/sam2_1003.gif
 +share/samba/swat/help/using_samba/figs/sam2_1004.gif
 +share/samba/swat/help/using_samba/figs/sam2_1005.gif
 +share/samba/swat/help/using_samba/figs/sam2_1006.gif
 +share/samba/swat/help/using_samba/figs/sam2_1101.gif
 +share/samba/swat/help/using_samba/figs/sam2_1102.gif
 +share/samba/swat/help/using_samba/figs/sam2_af01.gif
 +share/samba/swat/help/using_samba/figs/sam2_af02.gif
 +share/samba/swat/help/using_samba/figs/sam2_af03.gif
 +share/samba/swat/help/using_samba/figs/sam2_af04.gif
 +share/samba/swat/help/using_samba/figs/sam2_af05.gif
 +share/samba/swat/help/using_samba/figs/sam2_af06.gif
 +share/samba/swat/help/using_samba/figs/sam2_af07.gif
 +share/samba/swat/help/using_samba/inx.html
 +share/samba/swat/help/using_samba/samba2_s.gif
 +share/samba/swat/help/using_samba/samba2_xs.gif
 +share/samba/swat/help/using_samba/toc.html
 +@dirrm share/samba/swat/help/using_samba/figs
 +@dirrm share/samba/swat/help/using_samba
  @dirrm share/samba/swat/lang/tr/include
  @dirrm share/samba/swat/lang/tr/images
  @dirrm share/samba/swat/lang/tr/help
 @@ -568,11 +579,12 @@
  @dirrm share/samba/swat/lang
  @dirrm share/samba/swat/include
  @dirrm share/samba/swat/images
 -@dirrm share/samba/swat/help/Samba-HOWTO-Collection/images
 -@dirrm share/samba/swat/help/Samba-HOWTO-Collection
 -@dirrm share/samba/swat/help/Samba-Guide/images
 -@dirrm share/samba/swat/help/Samba-Guide
 -@dirrm share/samba/swat/help/Samba-Developers-Guide
 +@dirrm share/samba/swat/help/Samba3-HOWTO/images
 +@dirrm share/samba/swat/help/Samba3-HOWTO
 +@dirrm share/samba/swat/help/Samba3-ByExample/images
 +@dirrm share/samba/swat/help/Samba3-ByExample
 +@dirrm share/samba/swat/help/Samba3-Developers-Guide
 +@dirrm share/samba/swat/help/manpages
  @dirrm share/samba/swat/help
  @dirrm share/samba/swat
  @dirrm share/samba
 @@ -580,5 +592,6 @@
  @dirrm share/examples/samba
  @dirrm share/doc/samba
  @dirrm lib/samba/vfs
 +${PDBS}@dirrm lib/samba/pdb
  @dirrm lib/samba/charset
  @dirrm lib/samba
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/net/samba/distinfo,v
 retrieving revision 1.45
 diff -u -u -r1.45 distinfo
 --- distinfo   8 Jun 2005 20:15:20 -0000       1.45
 +++ distinfo   4 Nov 2005 06:21:06 -0000
 @@ -1,13 +1,22 @@
  $NetBSD: distinfo,v 1.45 2005/06/08 20:15:20 jlam Exp $
  
 -SHA1 (samba-3.0.14a.tar.gz) = 978ff392d575c717069c66e918f6bbbf815b84b1
 -RMD160 (samba-3.0.14a.tar.gz) = 69993b25fc5d4d172fc70e26b9e5e4b5b9ab0c0f
 -Size (samba-3.0.14a.tar.gz) = 15605851 bytes
 +SHA1 (samba-3.0.20b.tar.gz) = e46fa8465dd70c670d84d697e408e70cbc18bb56
 +RMD160 (samba-3.0.20b.tar.gz) = c7fe6cf7e3cae6835efd631f9c7d8b97c8253370
 +Size (samba-3.0.20b.tar.gz) = 17165513 bytes
 +SHA1 (print_lprm.patch) = 9610e7cc3ba475f7963a010a965e62299b37561f
 +RMD160 (print_lprm.patch) = 8bfaad7118e58ceeb7a691279b3642ea870c3568
 +Size (print_lprm.patch) = 12526 bytes
 +SHA1 (quota.patch) = a6fbe1de5133f5292d29121e1d450347db26612a
 +RMD160 (quota.patch) = d9c3616a9d552e5d5d84f61d05451d945cc20a3f
 +Size (quota.patch) = 491 bytes
 +SHA1 (bug3201_wbinfo.patch) = 0fa3d3547d35a725cc2483a3c8ab64dab0b9b8c5
 +RMD160 (bug3201_wbinfo.patch) = 2253d4ebfc7c162e0cf4b991c854c999b7b99316
 +Size (bug3201_wbinfo.patch) = 566 bytes
  SHA1 (patch-aa) = 20af8aaf492ee550254a007a05cdec20eb699c27
  SHA1 (patch-ab) = c5f352a07774b8e2873c2ac3b3de3ba4cb12bf5e
  SHA1 (patch-ac) = fc0d15f371a9c3544499f6a6cd830b52b34ff644
  SHA1 (patch-ad) = 8a99e5f898eb3c466b07b5bbb9f0c7e28e385ea0
  SHA1 (patch-af) = bc0cead8f8350001e5291443821e875bab540fc3
  SHA1 (patch-ag) = cce908577cf4007bb00b15f6dd7eee7d549ac5b0
 -SHA1 (patch-at) = faeb2c7d26bb6d7b17b13253bb567e33df90a74b
 -SHA1 (patch-au) = 1ed1be0ea34d28eb7387316ca4dd1eb7a18c7012
 +SHA1 (patch-at) = 2967771dbd5f7801bf83b28dcc31c9c7b59b592c
 +SHA1 (patch-au) = 648ab61a7377fccdf72432a160958ec6feb18955
 Index: options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/net/samba/options.mk,v
 retrieving revision 1.8
 diff -u -u -r1.8 options.mk
 --- options.mk 5 Jun 2005 14:17:53 -0000       1.8
 +++ options.mk 4 Nov 2005 06:21:06 -0000
 @@ -3,7 +3,7 @@
  # Global and legacy options
  
  PKG_OPTIONS_VAR=      PKG_OPTIONS.samba
 -PKG_SUPPORTED_OPTIONS=        pam ads cups ldap ldap-compat
 +PKG_SUPPORTED_OPTIONS=        pam ads cups ldap ldap-compat pgsql mysql xml
  .include "../../mk/bsd.options.mk"
  
  ###
 @@ -62,6 +62,49 @@
  .endif
  
  ###
 +### Support PostgreSQL authentication and storage of Samba account information
 +### Experimental!
 +###
 +.if !empty(PKG_OPTIONS:Mpgsql)
 +.  include "../../mk/pgsql.buildlink3.mk"
 +PDBS+=                        pgsql
 +PLIST_SUBST+=         PGSQL=
 +.else
 +PLIST_SUBST+=         PGSQL="@comment "
 +.endif
 +
 +###
 +### Support MySQL authentication and storage of Samba account information
 +### Experimental!
 +###
 +.if !empty(PKG_OPTIONS:Mmysql)
 +.  include "../../mk/mysql.buildlink3.mk"
 +PDBS+=                        mysql
 +PLIST_SUBST+=         MYSQL=
 +.else
 +PLIST_SUBST+=         MYSQL="@comment "
 +.endif
 +
 +###
 +### Support XML authentication and storage of Samba account information
 +### Experimental!
 +###
 +.if !empty(PKG_OPTIONS:Mxml)
 +.  include "../../textproc/libxml2/buildlink3.mk"
 +PDBS+=                        xml
 +PLIST_SUBST+=         XML=
 +.else
 +PLIST_SUBST+=         XML="@comment "
 +.endif
 +
 +.if !empty(PDBS)
 +CONFIGURE_ARGS+=      --with-expsam=${PDBS:ts,}
 +PLIST_SUBST+=         PDBS=
 +.else
 +PLIST_SUBST+=         PDBS="@comment "
 +.endif
 +
 +###
  ### Only Linux supports smbmount for mounting a Samba share into the
  ### filesystem.
  ###
 Index: patches/patch-at
 ===================================================================
 RCS file: /cvsroot/pkgsrc/net/samba/patches/patch-at,v
 retrieving revision 1.2
 diff -u -u -r1.2 patch-at
 --- patches/patch-at   8 Jun 2005 20:15:20 -0000       1.2
 +++ patches/patch-at   4 Nov 2005 06:21:06 -0000
 @@ -2,24 +2,6 @@
  
  --- configure.orig    2005-04-14 02:23:50.000000000 -0400
  +++ configure
 -@@ -4794,7 +4794,7 @@ cat >>confdefs.h <<\_ACEOF
 - _ACEOF
 - 
 -              ;;
 --     *freebsd*|*DragonFly*)
 -+     *freebsd*|*dragonfly*)
 - 
 - cat >>confdefs.h <<\_ACEOF
 - #define FREEBSD 1
 -@@ -22517,7 +22517,7 @@ cat >>confdefs.h <<\_ACEOF
 - _ACEOF
 - 
 -                      ;;
 --             *netbsd* | *freebsd* | *DragonFly* )
 -+             *netbsd* | *freebsd* | *dragonfly* )
 -                      BLDSHARED="true"
 -                      LDSHFLAGS="-shared"
 -                      DYNEXP="-Wl,--export-dynamic"
  @@ -29701,9 +29701,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
   
   
 @@ -75,12 +57,3 @@
     cat >>confdefs.h <<_ACEOF
   #define HAVE_DES_SET_KEY 1
   _ACEOF
 -@@ -38099,7 +38099,7 @@ echo "${ECHO_T}no" >&6;
 -      fi
 - 
 -      ;;
 --     *freebsd* | *DragonFly* )
 -+     *freebsd* | *dragonfly* )
 -              echo "$as_me:$LINENO: checking for freebsd sendfile support" >&5
 - echo $ECHO_N "checking for freebsd sendfile support... $ECHO_C" >&6
 - if test "${samba_cv_HAVE_SENDFILE+set}" = set; then
 Index: patches/patch-au
 ===================================================================
 RCS file: /cvsroot/pkgsrc/net/samba/patches/patch-au,v
 retrieving revision 1.2
 diff -u -u -r1.2 patch-au
 --- patches/patch-au   8 Jun 2005 20:15:20 -0000       1.2
 +++ patches/patch-au   4 Nov 2005 06:21:06 -0000
 @@ -2,24 +2,6 @@
  
  --- configure.in.orig 2005-04-14 02:14:26.000000000 -0400
  +++ configure.in
 -@@ -533,7 +533,7 @@ case "$host_os" in
 -      *irix*)
 -              AC_DEFINE(SYSV, 1, [Whether to enable System V compatibility])
 -              ;;
 --     *freebsd*|*DragonFly*)
 -+     *freebsd*|*dragonfly*)
 -              AC_DEFINE(FREEBSD, 1, [Whether the host os is FreeBSD])
 -              ;;
 - #
 -@@ -1223,7 +1223,7 @@ if test "$enable_shared" = "yes"; then
 -                      AC_DEFINE(STAT_ST_BLOCKSIZE,512)
 -                      AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work 
correctly])
 -                      ;;
 --             *netbsd* | *freebsd* | *DragonFly* )  
 -+             *netbsd* | *freebsd* | *dragonfly* )
 -                      BLDSHARED="true"
 -                      LDSHFLAGS="-shared"
 -                      DYNEXP="-Wl,--export-dynamic"
  @@ -2788,7 +2788,7 @@ if test x"$with_ads_support" != x"no"; t
     AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
   
 @@ -29,12 +11,3 @@
     AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
     AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)
   
 -@@ -4108,7 +4108,7 @@ samba_cv_HAVE_BROKEN_LINUX_SENDFILE=yes,
 -      fi
 - 
 -      ;;
 --     *freebsd* | *DragonFly* )
 -+     *freebsd* | *dragonfly* )
 -              AC_CACHE_CHECK([for freebsd sendfile 
support],samba_cv_HAVE_SENDFILE,[
 -              AC_TRY_LINK([\
 - #include <sys/types.h>