Update net/samba to 3.0.21a. Changes since version 3.0.20b include:

Bugfixes:
  o Address a bug in the oplock code which may cause clients to stall
    when multiple users are accessing a share concurrently
  o Missing groups in a user's token when logging in via kerberos
  o Incompatibilities with newer MS Windows hotfixes and
    embedded OS platforms
  o Portability and crash bugs.
  o Performance issues in winbindd.

Additions:
  o Complete NTLMv2 support by consolidating authentication
    mechanism used at the CIFS and RPC layers.
  o The capability to manage Unix services using the Win32
    Service Control API.
  o The capability to view external Unix log files via the
    Microsoft Event Viewer.
  o New libmsrpc share library for application developers.
  o Rewrite of CIFS oplock implementation.
  o Performance Counter external daemon.
  o Winbindd auto-detection query methods when communicating with
    a domain controller.
  o The ability to enumerate long share names in libsmbclient
    applications.

26 files changed, 186 insertions, 223 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index eb0f2905f28..d12681c44a3 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.12310 2006/01/02 21:50:43 veego Exp $
+$NetBSD: CHANGES,v 1.12311 2006/01/02 22:33:37 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2006:
 
@@ -34,3 +34,4 @@ Changes to the packages collection and infrastructure in 2006:
 	Updated www/neon to 0.25.4 [epg 2006-01-02]
 	Updated devel/subversion to 1.3.0 [epg 2006-01-02]
 	Updated databases/p5-perl-ldap to 0.33 [veego 2006-01-02]
+	Updated net/samba to 3.0.21a [jlam 2006-01-02]
diff --git a/net/samba/Makefile b/net/samba/Makefile
index cd636fb3b5f..2e31ba193f9 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.155 2005/12/29 06:22:02 jlam Exp $
+# $NetBSD: Makefile,v 1.156 2006/01/02 22:33:36 jlam Exp $
 
 .include "Makefile.mirrors"
 
-DISTNAME=		samba-3.0.20b
-PKGNAME=		samba-3.0.20.2
-PKGREVISION=		3
+DISTNAME=		samba-3.0.21a
 CATEGORIES=		net
 MASTER_SITES=		${SAMBA_MIRRORS:=old-versions/}
 DIST_SUBDIR=		${DISTNAME}
@@ -100,18 +98,41 @@ OWN_DIRS=		${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR}
 OWN_DIRS_PERMS=		${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0700
 RCD_SCRIPTS+=		samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
 
+# Get the shared library major and minors for the installed shared
+# libraries.  We'll need these to create the versioned symlinks for
+# the shared libraries because samba Makefile doesn't do it on its
+# own.
+#
+.for LIB in LIBSMBCLIENT LIBMSRPC
+.  for NUM in MAJOR MINOR
+${LIB}_${NUM}_cmd=	${AWK} -F= '/^${LIB}_${NUM}/ { print $$2; }'	\
+				${WRKSRC}/Makefile.in
+${LIB}_${NUM}=		${${LIB}_${NUM}_cmd:sh}
+PLIST_SUBST+=		${LIB}_${NUM}=${${LIB}_${NUM}}
+.  endfor
+.endfor
+
+install-samba-lib-symlinks:
+	cd ${SAMBA_LIBDIR} && ${LN} -s libmsrpc.so			\
+		libmsrpc.so.${LIBMSRPC_MAJOR}
+	cd ${SAMBA_LIBDIR} && ${LN} -s libmsrpc.so			\
+		libmsrpc.so.${LIBMSRPC_MAJOR}.${LIBMSRPC_MINOR}
+	cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so			\
+		libsmbclient.so.${LIBSMBCLIENT_MAJOR}
+	cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so			\
+		libsmbclient.so.${LIBSMBCLIENT_MAJOR}.${LIBSMBCLIENT_MINOR}
+
 post-build:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/adduser.sh > ${WRKDIR}/adduser.sh
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh
 
-post-install:
+post-install: install-samba-lib-symlinks
 	${RMDIR} ${PREFIX}/share/samba/swat/lang/ja/include
 	${RMDIR} ${PREFIX}/share/samba/swat/lang/ja/images
 	${RMDIR} ${PREFIX}/share/samba/swat/lang/tr/include
-	for d in auth idmap pdb rpc; do					\
+	for d in idmap pdb rpc; do					\
 		${RMDIR} ${SAMBA_LIBDIR}/$$d;				\
 	done
-	-cd ${SAMBA_LIBDIR} && ${LN} -s libsmbclient.so libsmbclient.so.0
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC}/../docs/registry; for f in *.reg; do		\
 		${INSTALL_DATA} $${f} ${DOCDIR}/$${f};			\
diff --git a/net/samba/Makefile.mirrors b/net/samba/Makefile.mirrors
index b22f4adca23..7b243ce725d 100644
--- a/net/samba/Makefile.mirrors
+++ b/net/samba/Makefile.mirrors
@@ -1,39 +1,42 @@
-# $NetBSD: Makefile.mirrors,v 1.1 2005/11/14 08:05:27 jlam Exp $
+# $NetBSD: Makefile.mirrors,v 1.2 2006/01/02 22:33:36 jlam Exp $
 #
 # This Makefile fragment contains the mirror sites for fetching Samba.
 
 ###
-### This list was last updated on 20051024 from:
+### This list was last updated on 20060102 from:
 ###	http://www.samba.org/samba/download/ftp_mirrors.html
 ###
 SAMBA_MIRRORS=	\
 	ftp://ftp.samba.org/pub/samba/ \
+	ftp://ftp.planetmirror.com/pub/samba/ \
 	ftp://gd.tuwien.ac.at/infosys/servers/samba/ \
 	ftp://ftp.easynet.be/samba/ \
 	ftp://ftp.pucpr.br/samba/ \
 	ftp://ca.samba.org/ \
+	ftp://ftp.linuxforum.net/ftp.samba.org/ \
 	ftp://mirror.kn.vutbr.cz/pub/MIRRORS/samba/ \
 	ftp://mirrors.dotsrc.org/samba/ \
 	ftp://fi.samba.org/pub/samba/ \
+	ftp://de3.samba.org/pub/samba/ \
 	ftp://de.samba.org/samba.org/ \
 	ftp://ftp.ntua.gr/pub/net/samba/ \
-	ftp://ie.samba.org/mirrors/ftp.samba.org/pub/samba/ \
 	ftp://ftp.heanet.ie/pub/samba/ \
+	ftp://ie.samba.org/mirrors/ftp.samba.org/pub/samba/ \
 	ftp://ftp.ring.gr.jp/pub/net/samba/ \
+	ftp://ftp.samba.gr.jp/pub/samba/ \
 	ftp://ftp.bit.nl/mirror/samba/ \
 	ftp://www.bibsyst.no/pub/samba/ \
-	ftp://giswitch.sggw.waw.pl/pub/unix/samba/ \
 	ftp://pl.samba.org/pub/unix/net/samba/ \
+	ftp://giswitch.sggw.waw.pl/pub/unix/samba/ \
 	ftp://ftp.citkit.ru/pub/samba/ \
 	ftp://ru.samba.org/pub/samba/ \
 	ftp://ru2.samba.org// \
 	ftp://ftp.chg.ru/packages/samba/ \
-	ftp://cs.samba.org/pub/samba/ \
 	ftp://ftp.oss.eznetsols.org/samba/ \
 	ftp://ftp.k2.net/mirrors/samba/ \
 	ftp://se.samba.org/pub/samba/ \
+	ftp://ftp.ulak.net.tr/samba/ \
 	ftp://us1.samba.org/pub/samba/ \
 	ftp://us5.samba.org/pub/samba-ftp/ \
 	ftp://us2.samba.org/pub/samba/ \
-	ftp://us4.samba.org/pub/samba/ \
-	ftp://sunsite.org.uk/package/samba/
+	ftp://us4.samba.org/pub/samba/
diff --git a/net/samba/Makefile.patches b/net/samba/Makefile.patches
index 165f2c522af..7fe60010bc8 100644
--- a/net/samba/Makefile.patches
+++ b/net/samba/Makefile.patches
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.patches,v 1.1 2005/11/14 08:05:27 jlam Exp $
+# $NetBSD: Makefile.patches,v 1.2 2006/01/02 22:33:36 jlam Exp $
 #
 # This Makefile fragment describes the recommended patches for the
 # currently packaged version of Samba.  All recommended patches for
@@ -11,13 +11,3 @@
 # they are added to ${PATCH_SITES}.
 #
 PATCH_SITES=	http://www.samba.org/samba/patches/
-PATCHFILES=	# empty
-
-PATCHFILES+=	print_lprm.patch
-PATCH_DIST_STRIP.print_lprm.patch=	-p2
-
-PATCHFILES+=	quota.patch
-PATCH_DIST_STRIP.quota.patch=           -p2
-
-PATCHFILES+=	bug3201_wbinfo.patch
-PATCH_DIST_STRIP.bug3201_wbinfo.patch=  -p0
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 482cce655c7..50642d7ed39 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.32 2005/11/14 08:05:27 jlam Exp $
+@comment $NetBSD: PLIST,v 1.33 2006/01/02 22:33:36 jlam Exp $
+bin/eventlogadm
 bin/findsmb
 bin/net
 bin/nmblookup
@@ -10,6 +11,7 @@ bin/smbcacls
 bin/smbclient
 bin/smbcontrol
 bin/smbcquotas
+bin/smbget
 ${SMBMOUNT}bin/smbmnt
 ${SMBMOUNT}bin/smbmount
 bin/smbpasswd
@@ -23,9 +25,11 @@ bin/tdbdump
 bin/tdbtool
 bin/testparm
 ${WINBIND}bin/wbinfo
+include/libmsrpc.h
 include/libsmbclient.h
 ${NSS_WINBIND}
 ${NSS_WINS}
+lib/samba/auth/script.so
 lib/samba/charset/CP437.so
 lib/samba/charset/CP850.so
 lib/samba/de.msg
@@ -33,8 +37,12 @@ lib/samba/en.msg
 lib/samba/fr.msg
 lib/samba/it.msg
 lib/samba/ja.msg
+lib/samba/libmsrpc.so
+lib/samba/libmsrpc.so.${LIBMSRPC_MAJOR}
+lib/samba/libmsrpc.so.${LIBMSRPC_MAJOR}.${LIBMSRPC_MINOR}
 lib/samba/libsmbclient.so
-lib/samba/libsmbclient.so.0
+lib/samba/libsmbclient.so.${LIBSMBCLIENT_MAJOR}
+lib/samba/libsmbclient.so.${LIBSMBCLIENT_MAJOR}.${LIBSMBCLIENT_MINOR}
 lib/samba/lowcase.dat
 lib/samba/nl.msg
 lib/samba/pl.msg
@@ -55,7 +63,6 @@ lib/samba/vfs/shadow_copy.so
 ${PAM_SMBPASS}
 ${PAM_WINBIND}
 ${CUPS}libexec/cups/backend/smb
-man/man1/editreg.1
 man/man1/findsmb.1
 man/man1/log2pcap.1
 man/man1/nmblookup.1
@@ -67,12 +74,10 @@ man/man1/smbclient.1
 man/man1/smbcontrol.1
 man/man1/smbcquotas.1
 man/man1/smbget.1
-man/man1/smbsh.1
 man/man1/smbstatus.1
 man/man1/smbtar.1
 man/man1/smbtree.1
 man/man1/testparm.1
-man/man1/testprns.1
 man/man1/vfstest.1
 man/man1/wbinfo.1
 man/man5/lmhosts.5
@@ -80,11 +85,11 @@ man/man5/smb.conf.5
 man/man5/smbgetrc.5
 man/man5/smbpasswd.5
 man/man7/samba.7
-man/man8/libsmbclient.8
+man/man7/libsmbclient.7
+man/man7/pam_winbind.7
 man/man8/mount.cifs.8
 man/man8/net.8
 man/man8/nmbd.8
-man/man8/pam_winbind.8
 man/man8/pdbedit.8
 man/man8/smbd.8
 man/man8/smbmnt.8
@@ -113,7 +118,6 @@ share/doc/samba/Win98_PlainPassword.reg
 share/doc/samba/Win9X-CacheHandling.reg
 share/doc/samba/WinME_PlainPassword.reg
 share/doc/samba/WinXP_PlainPassword.reg
-share/doc/samba/WinXP_SignOrSeal.reg
 share/doc/samba/WindowsTerminalServer.reg
 share/examples/rc.d/nmbd
 share/examples/rc.d/samba
@@ -334,10 +338,9 @@ 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/libsmbclient.7.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
@@ -345,7 +348,7 @@ 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/pam_winbind.7.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
@@ -372,7 +375,6 @@ 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
@@ -586,4 +588,5 @@ ${PAM}@dirrm share/examples/samba/pam_smbpass
 @dirrm share/doc/samba
 @dirrm lib/samba/vfs
 @dirrm lib/samba/charset
+@dirrm lib/samba/auth
 @dirrm lib/samba
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 08b755bd39d..b8baf7539d7 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,17 +1,8 @@
-$NetBSD: distinfo,v 1.46 2005/11/14 08:05:27 jlam Exp $
+$NetBSD: distinfo,v 1.47 2006/01/02 22:33:36 jlam Exp $
 
-SHA1 (samba-3.0.20b/samba-3.0.20b.tar.gz) = e46fa8465dd70c670d84d697e408e70cbc18bb56
-RMD160 (samba-3.0.20b/samba-3.0.20b.tar.gz) = c7fe6cf7e3cae6835efd631f9c7d8b97c8253370
-Size (samba-3.0.20b/samba-3.0.20b.tar.gz) = 17165513 bytes
-SHA1 (samba-3.0.20b/print_lprm.patch) = 9610e7cc3ba475f7963a010a965e62299b37561f
-RMD160 (samba-3.0.20b/print_lprm.patch) = 8bfaad7118e58ceeb7a691279b3642ea870c3568
-Size (samba-3.0.20b/print_lprm.patch) = 12526 bytes
-SHA1 (samba-3.0.20b/quota.patch) = a6fbe1de5133f5292d29121e1d450347db26612a
-RMD160 (samba-3.0.20b/quota.patch) = d9c3616a9d552e5d5d84f61d05451d945cc20a3f
-Size (samba-3.0.20b/quota.patch) = 491 bytes
-SHA1 (samba-3.0.20b/bug3201_wbinfo.patch) = 0fa3d3547d35a725cc2483a3c8ab64dab0b9b8c5
-RMD160 (samba-3.0.20b/bug3201_wbinfo.patch) = 2253d4ebfc7c162e0cf4b991c854c999b7b99316
-Size (samba-3.0.20b/bug3201_wbinfo.patch) = 566 bytes
+SHA1 (samba-3.0.21a/samba-3.0.21a.tar.gz) = c8d339801f2f1c60a4bb652aee85da6a0eb5d224
+RMD160 (samba-3.0.21a/samba-3.0.21a.tar.gz) = 0daede1526cacd631654a82b33af48ffb4789ce4
+Size (samba-3.0.21a/samba-3.0.21a.tar.gz) = 17524018 bytes
 SHA1 (patch-ab) = 43e97366a460b0aa19667719f7235c9eb2a58022
 SHA1 (patch-ac) = 47529dfe904768e6a3076131978c89fe2d1e3619
 SHA1 (patch-ad) = dd1f36ce1ccabaf3b4efb1d61a8af1f4d3d1857a
@@ -23,39 +14,36 @@ SHA1 (patch-ai) = 6e4500634cf3023d1ff22e4df3352d619f93aabc
 SHA1 (patch-aj) = c9e406113cdfc21c06483796a7008eb98a7d49fe
 SHA1 (patch-ak) = 0c69720954282022c7982d36eaee94a03db7b689
 SHA1 (patch-al) = 9962f9ad7a495f4be4bcf1ec9e42ca51a2c417b8
-SHA1 (patch-am) = 4abd7c8e7b5601b78094d5a302962ea54ef9d0ad
-SHA1 (patch-at) = e741a3a2f7802c2ca9228822085ff8a92b4d61f1
-SHA1 (patch-au) = 7e9c9e4490b4d242800d1e6485b4284466c5499d
-SHA1 (patch-av) = 041e59feb5398e5bbeba3fe1a0190cb7340f60bc
+SHA1 (patch-am) = d2f0b7798bbcf25e887cca8ef9bbd4146aa5d409
+SHA1 (patch-at) = 38d85d8c35569902c257532e076ea9ad2fc5c6d4
+SHA1 (patch-au) = 4b6d26f871263c81792de8132b5beb1008f1805c
+SHA1 (patch-av) = cb1c699eecce8aea8454308be6a4ab3f6b767b06
 SHA1 (patch-aw) = 374b1660d31ed54b85e68b49e25d80c2c54961be
 SHA1 (patch-ax) = 778ff50316524d06d0c609b0aa8c6dfb48914a8e
 SHA1 (patch-ay) = 054ba0c228a546af7f020a79b707e5fff0b21ff7
-SHA1 (patch-ba) = 05c6d1a0d209a6a22d7a5b310048ac45134cd2a7
+SHA1 (patch-ba) = c6cfc30753b29a749b14cb3d3d95595e9e2e8c11
 SHA1 (patch-bb) = 7a51028a9b5d81e4491b09b62851378e16425a99
 SHA1 (patch-bc) = a2c94726ca3eb7be9468becdc0c8ac69fc47fae6
-SHA1 (patch-bd) = e12fb3072f62838df15686e13229c13b2869828b
+SHA1 (patch-bd) = 039eda1d77456fbddbcb0a11007dcaebda78fbc9
 SHA1 (patch-be) = abd72608a8f62ef1caa276b0f016f68458bb7078
-SHA1 (patch-bf) = 9c393853521ae46bd0e1ebb0924c5433c56b7e61
+SHA1 (patch-bf) = 66cf695f028d204063c89156bf380deffe703c10
 SHA1 (patch-bg) = c247e4d269d71f992f061a6fbc56b22579d08a09
-SHA1 (patch-bh) = 6453d565d75d5cb1836d5a7341107674c05ba19a
-SHA1 (patch-bi) = cc3cce1ca2fe1c311c6d55332a7cdb41a938cf2e
+SHA1 (patch-bh) = 79f301fd1f8cd3d72d8106de6d0d315711d13219
+SHA1 (patch-bi) = 732a7fbc1c981e32554646e557da6299582b0021
 SHA1 (patch-bj) = 0dd428bc8301762d32661861c83f7067bde39ae1
-SHA1 (patch-bk) = fb2a36279eaece513481fe55007721150789fd9f
+SHA1 (patch-bk) = 452346a8b031264a9a3e0f9b72ebe42c5e17134f
 SHA1 (patch-bl) = 5f29a953dd9cadea8a27526778cc2257ccf3fd7c
 SHA1 (patch-bm) = dba69070a9201f77b95f254ee4d9a0e8557894db
 SHA1 (patch-bn) = c3a10f18dbcaa71775e7c290d0ac7d98288ba2f0
-SHA1 (patch-bo) = d0dcfa6effcfb0c8470d5bc2f50343d588e8c79f
-SHA1 (patch-bp) = a4568f166e3578293cb46ae298046d716b5398d0
+SHA1 (patch-bo) = dce02333957386001a1fd841a5851453dcd4860b
+SHA1 (patch-bp) = 5708ce5a71c31b3cdab3b786a94eafbdfc31c46f
 SHA1 (patch-bq) = dc25eb43336d4ad7ecef1b4ea8c5dcd72cc91a7b
-SHA1 (patch-br) = 109b2933b949c88985f42ec0eb5f4bf01824a780
-SHA1 (patch-bs) = eacec406b285ab3d669ac2666f2cca5d96798991
-SHA1 (patch-bt) = 814b299cf9abc9ec7e3b86f48f42e0a2e2154e1b
-SHA1 (patch-bu) = b3e2a2c02cf31419e3ece37aecd0eb566e809419
+SHA1 (patch-br) = fc289614054ca1eb39f5ba834c81d2adec2e2217
+SHA1 (patch-bs) = be0fd34166886b2e8ce735c859ac019580ec6400
+SHA1 (patch-bt) = f11307c2519126ec1ae776af7ccd5ef6be378060
+SHA1 (patch-bu) = 5d02e06c0a1234bf451ac977c6a66b1677a49c2c
 SHA1 (patch-bv) = 2e594d4ed4a98105b1a1311042f14e5f960aa067
-SHA1 (patch-bw) = c10fb9e9dfb8cf048238261675ef2c74b4ca01c6
+SHA1 (patch-bw) = 04b0d59e6a59ae04faa81663f032baaa54393fca
 SHA1 (patch-bx) = b46172b1e7e4937039b894eff7caf6dff5cbba62
 SHA1 (patch-by) = adc269c07d06108fe77afbb65d5eb309fc4d6d67
 SHA1 (patch-bz) = 143ff731caced00aa6ba589a1d83581a7449b853
-SHA1 (patch-ca) = 3d752643803ed14f01d4d45ed8fc434979db44b6
-SHA1 (patch-cb) = 42797dd1d7fc7ff34811b71e98f99c4f1b08eaa8
-SHA1 (patch-cc) = bb5f1a5da681e947b218eeff928d939e1219ddb2
diff --git a/net/samba/patches/patch-am b/net/samba/patches/patch-am
index 0fbe01fcf9c..594074fe17f 100644
--- a/net/samba/patches/patch-am
+++ b/net/samba/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.5 2005/11/14 08:05:27 jlam Exp $
+$NetBSD: patch-am,v 1.6 2006/01/02 22:33:36 jlam Exp $
 
---- sam/idmap_rid.c.orig	2005-10-12 13:03:38.000000000 -0400
+--- sam/idmap_rid.c.orig	2005-10-17 22:45:04.000000000 -0400
 +++ sam/idmap_rid.c
 @@ -24,8 +24,6 @@
  #undef DBGC_CLASS
@@ -11,7 +11,7 @@ $NetBSD: patch-am,v 1.5 2005/11/14 08:05:27 jlam Exp $
  struct dom_entry {
  	fstring name;
  	fstring sid;
-@@ -548,7 +546,7 @@ static struct idmap_methods rid_methods 
+@@ -553,7 +551,7 @@ static struct idmap_methods rid_methods 
  	rid_idmap_status
  };
  
diff --git a/net/samba/patches/patch-at b/net/samba/patches/patch-at
index 33ed6cc7c49..d4426339fce 100644
--- a/net/samba/patches/patch-at
+++ b/net/samba/patches/patch-at
@@ -1,17 +1,17 @@
-$NetBSD: patch-at,v 1.3 2005/11/14 08:05:27 jlam Exp $
+$NetBSD: patch-at,v 1.4 2006/01/02 22:33:36 jlam Exp $
 
---- configure.orig	2005-10-12 22:20:04.000000000 -0400
+--- configure.orig	2005-12-29 18:50:51.000000000 -0500
 +++ configure
 @@ -310,7 +310,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir piddir logfilebase privatedir swatdir LDSHFLAGS SONAMEFLAG SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLCLIENT INSTALLCLIENTCMD_SH INSTALLCLIENTCMD_A LIBSMBCLIENT_SHARED LIBSMBCLIENT LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir statedir piddir logfilebase privatedir swatdir LDSHFLAGS SONAMEFLAG SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLCLIENT INSTALLCLIENTCMD_SH INSTALLCLIENTCMD_A LIBSMBCLIENT_SHARED LIBSMBCLIENT LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir piddir logfilebase privatedir swatdir LDSHFLAGS SONAMEFLAG SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLLIBCMD_SH INSTALLLIBCMD_A INSTALL_LIBMSRPC LIBMSRPC_SHARED LIBMSRPC INSTALL_LIBSMBCLIENT LIBSMBCLIENT_SHARED LIBSMBCLIENT INSTALL_LIBSMBSHAREMODES LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS CONFIG_LIBS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir statedir piddir logfilebase privatedir swatdir LDSHFLAGS SONAMEFLAG SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLLIBCMD_SH INSTALLLIBCMD_A INSTALL_LIBMSRPC LIBMSRPC_SHARED LIBMSRPC INSTALL_LIBSMBCLIENT LIBSMBCLIENT_SHARED LIBSMBCLIENT INSTALL_LIBSMBSHAREMODES LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS CONFIG_LIBS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -863,6 +863,7 @@ Optional Packages:
+@@ -864,6 +864,7 @@ Optional Packages:
    --with-fhs              Use FHS-compliant paths (default=no)
    --with-privatedir=DIR   Where to put smbpasswd ($ac_default_prefix/private)
    --with-lockdir=DIR      Where to put lock files ($ac_default_prefix/var/locks)
@@ -19,7 +19,7 @@ $NetBSD: patch-at,v 1.3 2005/11/14 08:05:27 jlam Exp $
    --with-piddir=DIR       Where to put pid files ($ac_default_prefix/var/locks)
    --with-swatdir=DIR      Where to put SWAT files ($ac_default_prefix/swat)
    --with-configdir=DIR    Where to put configuration files ($libdir)
-@@ -1424,6 +1425,7 @@ fi
+@@ -1426,6 +1427,7 @@ fi
  
  
  lockdir="\${VARDIR}/locks"
@@ -27,7 +27,7 @@ $NetBSD: patch-at,v 1.3 2005/11/14 08:05:27 jlam Exp $
  piddir="\${VARDIR}/locks"
  mandir="\${prefix}/man"
  logfilebase="\${VARDIR}"
-@@ -1438,7 +1440,8 @@ if test "${with_fhs+set}" = set; then
+@@ -1440,7 +1442,8 @@ if test "${with_fhs+set}" = set; then
    withval="$with_fhs"
     case "$withval" in
    yes)
@@ -37,7 +37,7 @@ $NetBSD: patch-at,v 1.3 2005/11/14 08:05:27 jlam Exp $
      piddir="\${VARDIR}/run"
      mandir="\${prefix}/share/man"
      logfilebase="\${VARDIR}/log/samba"
-@@ -1491,6 +1494,26 @@ echo "$as_me: WARNING: --with-lockdir ca
+@@ -1493,6 +1496,26 @@ echo "$as_me: WARNING: --with-lockdir ca
  fi;
  
  #################################################
@@ -64,7 +64,7 @@ $NetBSD: patch-at,v 1.3 2005/11/14 08:05:27 jlam Exp $
  # set pid directory location
  
  # Check whether --with-piddir or --without-piddir was given.
-@@ -16912,6 +16935,107 @@ done
+@@ -16939,6 +16962,107 @@ done
  
  
  
@@ -172,7 +172,7 @@ $NetBSD: patch-at,v 1.3 2005/11/14 08:05:27 jlam Exp $
  for ac_func in syslog vsyslog timegm
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-@@ -31314,9 +31438,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
+@@ -32635,9 +32759,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
  
  
  
@@ -185,7 +185,7 @@ $NetBSD: patch-at,v 1.3 2005/11/14 08:05:27 jlam Exp $
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -31332,11 +31456,11 @@ extern "C"
+@@ -32653,11 +32777,11 @@ extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -199,7 +199,7 @@ $NetBSD: patch-at,v 1.3 2005/11/14 08:05:27 jlam Exp $
    ;
    return 0;
  }
-@@ -31363,22 +31487,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -32684,22 +32808,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -227,7 +227,7 @@ $NetBSD: patch-at,v 1.3 2005/11/14 08:05:27 jlam Exp $
    cat >>confdefs.h <<_ACEOF
  #define HAVE_DES_SET_KEY 1
  _ACEOF
-@@ -41304,13 +41428,37 @@ case "$host_os" in
+@@ -44140,13 +44264,37 @@ case "$host_os" in
  	*linux*)
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
  		;;
@@ -272,7 +272,7 @@ $NetBSD: patch-at,v 1.3 2005/11/14 08:05:27 jlam Exp $
  		;;
  	*irix*)
  		# IRIX has differently named shared libraries
-@@ -44539,6 +44687,7 @@ s,@ECHO_T@,$ECHO_T,;t t
+@@ -47561,6 +47709,7 @@ s,@ECHO_T@,$ECHO_T,;t t
  s,@LIBS@,$LIBS,;t t
  s,@configdir@,$configdir,;t t
  s,@lockdir@,$lockdir,;t t
diff --git a/net/samba/patches/patch-au b/net/samba/patches/patch-au
index b1aac7769dc..1103933e65c 100644
--- a/net/samba/patches/patch-au
+++ b/net/samba/patches/patch-au
@@ -1,6 +1,6 @@
-$NetBSD: patch-au,v 1.3 2005/11/14 08:05:27 jlam Exp $
+$NetBSD: patch-au,v 1.4 2006/01/02 22:33:36 jlam Exp $
 
---- configure.in.orig	2005-10-12 13:03:39.000000000 -0400
+--- configure.in.orig	2005-12-14 07:45:51.000000000 -0500
 +++ configure.in
 @@ -23,6 +23,7 @@ fi
  AC_PREFIX_DEFAULT(/usr/local/samba)
@@ -51,7 +51,7 @@ $NetBSD: patch-au,v 1.3 2005/11/14 08:05:27 jlam Exp $
  AC_SUBST(piddir)
  AC_SUBST(logfilebase)
  AC_SUBST(privatedir)
-@@ -1134,6 +1153,7 @@ AC_CHECK_FUNCS(setpriv setgidx setuidx s
+@@ -1150,6 +1169,7 @@ AC_CHECK_FUNCS(setpriv setgidx setuidx s
  AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt dup2 lseek64 ftruncate64)
  AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf)
  AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)
@@ -59,7 +59,7 @@ $NetBSD: patch-au,v 1.3 2005/11/14 08:05:27 jlam Exp $
  AC_CHECK_FUNCS(srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink)
  AC_CHECK_FUNCS(syslog vsyslog timegm)
  AC_CHECK_FUNCS(setlocale nl_langinfo)
-@@ -2996,7 +3016,7 @@ if test x"$with_ads_support" != x"no"; t
+@@ -3040,7 +3060,7 @@ if test x"$with_ads_support" != x"no"; t
    AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
  
    # Heimdal checks.
@@ -68,7 +68,7 @@ $NetBSD: patch-au,v 1.3 2005/11/14 08:05:27 jlam Exp $
    AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
    AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)
  
-@@ -4710,13 +4730,37 @@ case "$host_os" in
+@@ -4881,13 +4901,37 @@ case "$host_os" in
  	*linux*)
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
  		;;
diff --git a/net/samba/patches/patch-av b/net/samba/patches/patch-av
index a287e5d19c0..0b26612425a 100644
--- a/net/samba/patches/patch-av
+++ b/net/samba/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.1 2005/11/14 08:05:27 jlam Exp $
+$NetBSD: patch-av,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- script/installman.sh.orig	2005-10-12 13:03:44.000000000 -0400
+--- script/installman.sh.orig	2005-12-02 16:58:47.000000000 -0500
 +++ script/installman.sh
-@@ -29,7 +29,7 @@ for lang in $langs; do
+@@ -32,7 +32,7 @@ for lang in $langs; do
      langdir=$MANDIR/$lang
      for d in $MANDIR $langdir $langdir/man1 $langdir/man5 $langdir/man7 $langdir/man8; do
  	if [ ! -d $d ]; then
diff --git a/net/samba/patches/patch-ba b/net/samba/patches/patch-ba
index 1d1eb511f40..92db2940ae3 100644
--- a/net/samba/patches/patch-ba
+++ b/net/samba/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1 2005/11/14 08:05:27 jlam Exp $
+$NetBSD: patch-ba,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- Makefile.in.orig	2005-10-12 13:03:23.000000000 -0400
+--- Makefile.in.orig	2005-12-14 07:45:49.000000000 -0500
 +++ Makefile.in
-@@ -90,6 +90,9 @@ SWATDIR = @swatdir@
+@@ -91,6 +91,9 @@ SWATDIR = @swatdir@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ba,v 1.1 2005/11/14 08:05:27 jlam Exp $
  # the directory where pid files go
  PIDDIR = @piddir@
  
-@@ -113,7 +116,7 @@ PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB
+@@ -117,7 +120,7 @@ PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB
  PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\"
  PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\" -DDRIVERFILE=\"$(DRIVERFILE)\" 
  PATH_FLAGS3 = $(PATH_FLAGS2) -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" 
@@ -21,7 +21,7 @@ $NetBSD: patch-ba,v 1.1 2005/11/14 08:05:27 jlam Exp $
  PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
  	      -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
  PATH_FLAGS6 = $(PATH_FLAGS5) -DCONFIGDIR=\"$(CONFIGDIR)\"
-@@ -908,7 +911,7 @@ bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUI
+@@ -963,7 +966,7 @@ bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUI
  
  bin/smbget@EXEEXT@: $(SMBGET_OBJ) @BUILD_POPT@ bin/.dummy
  	@echo Linking $@
@@ -30,7 +30,7 @@ $NetBSD: patch-ba,v 1.1 2005/11/14 08:05:27 jlam Exp $
  
  bin/samtest@EXEEXT@: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy
  	@echo Linking $@
-@@ -936,11 +939,11 @@ bin/msgtest@EXEEXT@: $(MSGTEST_OBJ) bin/
+@@ -991,11 +994,11 @@ bin/msgtest@EXEEXT@: $(MSGTEST_OBJ) bin/
  
  bin/smbcacls@EXEEXT@: $(SMBCACLS_OBJ) @BUILD_POPT@ bin/.dummy
  	@echo Linking $@
@@ -42,9 +42,9 @@ $NetBSD: patch-ba,v 1.1 2005/11/14 08:05:27 jlam Exp $
 -	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS)
 +	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS)
  
- bin/locktest@EXEEXT@: $(LOCKTEST_OBJ) bin/.dummy
+ bin/eventlogadm@EXEEXT@: $(EVTLOGADM_OBJ) @BUILD_POPT@ bin/.dummy
  	@echo Linking $@
-@@ -995,7 +998,7 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bi
+@@ -1054,7 +1057,7 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bi
  bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
  	@echo Linking libsmbclient shared library $@
  	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
@@ -53,7 +53,7 @@ $NetBSD: patch-ba,v 1.1 2005/11/14 08:05:27 jlam Exp $
  		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
  
  bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
-@@ -1275,11 +1278,11 @@ bin/ntlm_auth@EXEEXT@: $(NTLM_AUTH_OBJ) 
+@@ -1352,11 +1355,11 @@ bin/ntlm_auth@EXEEXT@: $(NTLM_AUTH_OBJ) 
  	@echo Linking $@
  	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
  		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
@@ -65,9 +65,9 @@ $NetBSD: patch-ba,v 1.1 2005/11/14 08:05:27 jlam Exp $
 -	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS)
 +	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc $(LDAP_LIBS) $(KRB5LIBS) $(PASSDB_LIBS)
  
- bin/libmsrpc.a: $(LIBMSRPC_PICOBJ)
- 	@-$(AR) -rc $@ $(LIBMSRPC_PICOBJ) 
-@@ -1325,7 +1328,7 @@ install-everything: install installmodul
+ bin/tdbbackup@EXEEXT@: $(TDBBACKUP_OBJ) bin/.dummy
+ 	@echo Linking $@
+@@ -1402,7 +1405,7 @@ install-everything: install installmodul
  # is not used
  
  installdirs:
@@ -76,7 +76,7 @@ $NetBSD: patch-ba,v 1.1 2005/11/14 08:05:27 jlam Exp $
  
  installservers: all installdirs
  	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS)
-@@ -1421,6 +1424,7 @@ showlayout: 
+@@ -1505,6 +1508,7 @@ showlayout: 
  	@echo "  privatedir:  $(PRIVATE_DIR)"
  	@echo "  configdir:   $(CONFIGDIR)"
  	@echo "  lockdir:     $(LOCKDIR)"
diff --git a/net/samba/patches/patch-bd b/net/samba/patches/patch-bd
index d56cfc8c8b2..ed8c5b25311 100644
--- a/net/samba/patches/patch-bd
+++ b/net/samba/patches/patch-bd
@@ -1,11 +1,11 @@
-$NetBSD: patch-bd,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-bd,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- lib/account_pol.c.orig	2005-10-12 13:03:31.000000000 -0400
+--- lib/account_pol.c.orig	2005-12-20 10:28:38.000000000 -0500
 +++ lib/account_pol.c
-@@ -47,7 +47,7 @@ BOOL init_account_policy(void)
- 
- 	if (tdb)
+@@ -262,7 +262,7 @@ BOOL init_account_policy(void)
  		return True;
+ 	}
+ 
 -	tdb = tdb_open_log(lock_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 +	tdb = tdb_open_log(state_path("account_policy.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
  	if (!tdb) {
diff --git a/net/samba/patches/patch-bf b/net/samba/patches/patch-bf
index 88a59ce7f53..cd9b7b013ea 100644
--- a/net/samba/patches/patch-bf
+++ b/net/samba/patches/patch-bf
@@ -1,8 +1,8 @@
-$NetBSD: patch-bf,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-bf,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- nsswitch/winbindd_util.c.orig	2005-10-12 13:03:28.000000000 -0400
+--- nsswitch/winbindd_util.c.orig	2005-12-14 07:45:50.000000000 -0500
 +++ nsswitch/winbindd_util.c
-@@ -1159,7 +1159,7 @@ BOOL winbindd_upgrade_idmap(void)
+@@ -1173,7 +1173,7 @@ BOOL winbindd_upgrade_idmap(void)
  	SMB_STRUCT_STAT stbuf;
  	TDB_CONTEXT *idmap_tdb;
  
diff --git a/net/samba/patches/patch-bh b/net/samba/patches/patch-bh
index 3cd313ac869..d477e10d332 100644
--- a/net/samba/patches/patch-bh
+++ b/net/samba/patches/patch-bh
@@ -1,8 +1,8 @@
-$NetBSD: patch-bh,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-bh,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- registry/reg_db.c.orig	2005-10-12 13:03:45.000000000 -0400
+--- registry/reg_db.c.orig	2005-10-17 22:45:06.000000000 -0400
 +++ registry/reg_db.c
-@@ -198,12 +198,12 @@ BOOL init_registry_db( void )
+@@ -205,12 +205,12 @@ BOOL regdb_init( void )
  	if ( tdb_reg )
  		return True;
  
@@ -12,9 +12,23 @@ $NetBSD: patch-bh,v 1.1 2005/11/14 08:05:28 jlam Exp $
 -		tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
 +		tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
  		if ( !tdb_reg ) {
- 			DEBUG(0,("init_registry: Failed to open registry %s (%s)\n",
+ 			DEBUG(0,("regdb_init: Failed to open registry %s (%s)\n",
 -				lock_path("registry.tdb"), strerror(errno) ));
 +				state_path("registry.tdb"), strerror(errno) ));
  			return False;
  		}
  		
+@@ -252,11 +252,11 @@ WERROR regdb_open( void )
+ 	
+ 	become_root();
+ 
+-	tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
++	tdb_reg = tdb_open_log(state_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+ 	if ( !tdb_reg ) {
+ 		result = ntstatus_to_werror( map_nt_error_from_unix( errno ) );
+ 		DEBUG(0,("regdb_open: Failed to open %s! (%s)\n", 
+-			lock_path("registry.tdb"), strerror(errno) ));
++			state_path("registry.tdb"), strerror(errno) ));
+ 	}
+ 
+ 	unbecome_root();
diff --git a/net/samba/patches/patch-bi b/net/samba/patches/patch-bi
index 146587b2492..c517a21bb5f 100644
--- a/net/samba/patches/patch-bi
+++ b/net/samba/patches/patch-bi
@@ -1,8 +1,8 @@
-$NetBSD: patch-bi,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-bi,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- rpc_server/srv_srvsvc_nt.c.orig	2005-10-12 13:03:33.000000000 -0400
+--- rpc_server/srv_srvsvc_nt.c.orig	2005-12-14 07:45:50.000000000 -0500
 +++ rpc_server/srv_srvsvc_nt.c
-@@ -135,10 +135,10 @@ BOOL share_info_db_init(void)
+@@ -156,10 +156,10 @@ BOOL share_info_db_init(void)
   
  	if (share_tdb && local_pid == sys_getpid())
  		return True;
diff --git a/net/samba/patches/patch-bk b/net/samba/patches/patch-bk
index e22670c1157..5451544e12a 100644
--- a/net/samba/patches/patch-bk
+++ b/net/samba/patches/patch-bk
@@ -1,8 +1,8 @@
-$NetBSD: patch-bk,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-bk,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- utils/net_idmap.c.orig	2005-10-12 13:03:42.000000000 -0400
+--- utils/net_idmap.c.orig	2005-11-09 13:29:02.000000000 -0500
 +++ utils/net_idmap.c
-@@ -126,7 +126,7 @@ static NTSTATUS net_idmap_fixup_hwm(void
+@@ -136,7 +136,7 @@ static NTSTATUS net_idmap_fixup_hwm(void
  		return NT_STATUS_UNSUCCESSFUL;
  	}
  
diff --git a/net/samba/patches/patch-bo b/net/samba/patches/patch-bo
index e0eabe3f1b7..c72b383f1fd 100644
--- a/net/samba/patches/patch-bo
+++ b/net/samba/patches/patch-bo
@@ -1,8 +1,8 @@
-$NetBSD: patch-bo,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-bo,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- nmbd/nmbd.c.orig	2005-10-12 13:03:37.000000000 -0400
+--- nmbd/nmbd.c.orig	2005-11-09 13:29:00.000000000 -0500
 +++ nmbd/nmbd.c
-@@ -763,6 +763,10 @@ static BOOL open_sockets(BOOL isdaemon, 
+@@ -770,6 +770,10 @@ static BOOL open_sockets(BOOL isdaemon, 
  		mkdir(lp_lockdir(), 0755);
  	}
  
diff --git a/net/samba/patches/patch-bp b/net/samba/patches/patch-bp
index 41396946190..d7c6882fbe8 100644
--- a/net/samba/patches/patch-bp
+++ b/net/samba/patches/patch-bp
@@ -1,8 +1,8 @@
-$NetBSD: patch-bp,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-bp,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- smbd/server.c.orig	2005-10-12 13:03:25.000000000 -0400
+--- smbd/server.c.orig	2005-10-17 22:44:57.000000000 -0400
 +++ smbd/server.c
-@@ -867,6 +867,9 @@ void build_options(BOOL screen);
+@@ -866,6 +866,9 @@ void build_options(BOOL screen);
  	if (!directory_exist(lp_lockdir(), NULL))
  		mkdir(lp_lockdir(), 0755);
  
diff --git a/net/samba/patches/patch-br b/net/samba/patches/patch-br
index 651bb100543..4f5e15d8ed0 100644
--- a/net/samba/patches/patch-br
+++ b/net/samba/patches/patch-br
@@ -1,8 +1,8 @@
-$NetBSD: patch-br,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-br,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- lib/util.c.orig	2005-10-12 13:03:29.000000000 -0400
+--- lib/util.c.orig	2005-12-20 10:28:38.000000000 -0500
 +++ lib/util.c
-@@ -2370,6 +2370,26 @@ char *lock_path(const char *name)
+@@ -2375,6 +2375,26 @@ char *lock_path(const char *name)
  }
  
  /*****************************************************************
diff --git a/net/samba/patches/patch-bs b/net/samba/patches/patch-bs
index bba2c4e94af..2df7995ecdc 100644
--- a/net/samba/patches/patch-bs
+++ b/net/samba/patches/patch-bs
@@ -1,6 +1,6 @@
-$NetBSD: patch-bs,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-bs,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- param/loadparm.c.orig	2005-10-12 13:03:28.000000000 -0400
+--- param/loadparm.c.orig	2005-12-02 14:21:45.000000000 -0500
 +++ param/loadparm.c
 @@ -106,6 +106,7 @@ typedef struct
  	char *szDeletePrinterCommand;
@@ -10,7 +10,7 @@ $NetBSD: patch-bs,v 1.1 2005/11/14 08:05:28 jlam Exp $
  	char *szPidDir;
  	char *szRootdir;
  	char *szDefaultService;
-@@ -275,6 +276,7 @@ typedef struct
+@@ -270,6 +271,7 @@ typedef struct
  	BOOL bUnixPasswdSync;
  	BOOL bPasswdChatDebug;
  	int iPasswdChatTimeout;
@@ -18,7 +18,7 @@ $NetBSD: patch-bs,v 1.1 2005/11/14 08:05:28 jlam Exp $
  	BOOL bTimestampLogs;
  	BOOL bNTSmbSupport;
  	BOOL bNTPipeSupport;
-@@ -844,6 +846,7 @@ static struct parm_struct parm_table[] =
+@@ -861,6 +863,7 @@ static struct parm_struct parm_table[] =
  	{"passwd chat", P_STRING, P_GLOBAL, &Globals.szPasswdChat, NULL, NULL, FLAG_ADVANCED}, 
  	{"passwd chat debug", P_BOOL, P_GLOBAL, &Globals.bPasswdChatDebug, NULL, NULL, FLAG_ADVANCED}, 
  	{"passwd chat timeout", P_INTEGER, P_GLOBAL, &Globals.iPasswdChatTimeout, NULL, NULL, FLAG_ADVANCED}, 
@@ -26,7 +26,7 @@ $NetBSD: patch-bs,v 1.1 2005/11/14 08:05:28 jlam Exp $
  	{"check password script", P_STRING, P_GLOBAL, &Globals.szCheckPasswordScript, NULL, NULL, FLAG_ADVANCED}, 
  	{"username map", P_STRING, P_GLOBAL, &Globals.szUsernameMap, NULL, NULL, FLAG_ADVANCED}, 
  	{"password level", P_INTEGER, P_GLOBAL, &Globals.pwordlevel, NULL, NULL, FLAG_ADVANCED}, 
-@@ -1160,6 +1163,7 @@ static struct parm_struct parm_table[] =
+@@ -1176,6 +1179,7 @@ static struct parm_struct parm_table[] =
  	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
  	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED}, 
  	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
@@ -34,7 +34,7 @@ $NetBSD: patch-bs,v 1.1 2005/11/14 08:05:28 jlam Exp $
  	{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED}, 
  #ifdef WITH_UTMP
  	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
-@@ -1402,6 +1406,7 @@ static void init_globals(void)
+@@ -1421,6 +1425,7 @@ static void init_globals(void)
  	string_set(&Globals.szPasswdProgram, "");
  	string_set(&Globals.szPidDir, dyn_PIDDIR);
  	string_set(&Globals.szLockDir, dyn_LOCKDIR);
@@ -42,7 +42,7 @@ $NetBSD: patch-bs,v 1.1 2005/11/14 08:05:28 jlam Exp $
  	string_set(&Globals.szSocketAddress, "0.0.0.0");
  	pstrcpy(s, "Samba ");
  	pstrcat(s, SAMBA_VERSION_STRING);
-@@ -1480,6 +1485,7 @@ static void init_globals(void)
+@@ -1503,6 +1508,7 @@ static void init_globals(void)
  	Globals.bPamPasswordChange = False;
  	Globals.bPasswdChatDebug = False;
  	Globals.iPasswdChatTimeout = 2; /* 2 second default. */
@@ -50,7 +50,7 @@ $NetBSD: patch-bs,v 1.1 2005/11/14 08:05:28 jlam Exp $
  	Globals.bNTPipeSupport = True;	/* Do NT pipes by default. */
  	Globals.bNTStatusSupport = True; /* Use NT status by default. */
  	Globals.bStatCache = True;	/* use stat cache by default */
-@@ -1705,6 +1711,7 @@ FN_GLOBAL_STRING(lp_addprinter_cmd, &Glo
+@@ -1724,6 +1730,7 @@ FN_GLOBAL_STRING(lp_addprinter_cmd, &Glo
  FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
  FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
  FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
@@ -58,7 +58,7 @@ $NetBSD: patch-bs,v 1.1 2005/11/14 08:05:28 jlam Exp $
  FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
  FN_GLOBAL_STRING(lp_mangling_method, &Globals.szManglingMethod)
  FN_GLOBAL_INTEGER(lp_mangle_prefix, &Globals.mangle_prefix)
-@@ -1833,6 +1840,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, &
+@@ -1848,6 +1855,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, &
  FN_GLOBAL_BOOL(lp_unix_password_sync, &Globals.bUnixPasswdSync)
  FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug)
  FN_GLOBAL_INTEGER(lp_passwd_chat_timeout, &Globals.iPasswdChatTimeout)
diff --git a/net/samba/patches/patch-bt b/net/samba/patches/patch-bt
index 70e3fb7b4b5..a4049a88260 100644
--- a/net/samba/patches/patch-bt
+++ b/net/samba/patches/patch-bt
@@ -1,8 +1,8 @@
-$NetBSD: patch-bt,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-bt,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- ../docs/htmldocs/manpages/smb.conf.5.html.orig	2005-08-19 13:56:11.000000000 -0400
+--- ../docs/htmldocs/manpages/smb.conf.5.html.orig	2005-12-29 11:22:26.000000000 -0500
 +++ ../docs/htmldocs/manpages/smb.conf.5.html
-@@ -2797,6 +2797,11 @@ passdb backend = mysql:my_plugin_args td
+@@ -3033,6 +3033,11 @@ passdb backend = mysql:my_plugin_args td
      the subsequent answers must be received in one tenth of this time. The default it
      two seconds.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>passwd chat timeout</code></em> = 2
  </em></span>
@@ -14,7 +14,7 @@ $NetBSD: patch-bt,v 1.1 2005/11/14 08:05:28 jlam Exp $
  </p></dd><dt><span class="term"><a name="PASSWDPROGRAM"></a>passwd program (G)</span></dt><dd><p>The name of a program that can be used to set 
      UNIX user passwords.  Any occurrences of <em class="parameter"><code>%u</code></em> 
      will be replaced with the user name. The user name is checked for 
-@@ -3613,6 +3618,13 @@ smb passwd file = /etc/samba/smbpasswd
+@@ -3936,6 +3941,13 @@ smb passwd file = /etc/samba/smbpasswd
  	speed up case insensitive name mappings. You should never need 
  	to change this parameter.</p><p>Default: <span class="emphasis"><em><em class="parameter"><code>stat cache</code></em> = yes
  </em></span>
@@ -25,6 +25,6 @@ $NetBSD: patch-bt,v 1.1 2005/11/14 08:05:28 jlam Exp $
 +</em></span>
 +</p><p>Example: <span class="emphasis"><em><em class="parameter"><code>state directory</code></em> = /var/db/samba
 +</em></span>
- </p></dd><dt><span class="term"><a name="STOREDOSATTRIBUTES"></a>store dos attributes (S)</span></dt><dd><p>If this parameter is set Samba no longer attempts to
- 	map DOS attributes like SYSTEM, HIDDEN, ARCHIVE or READ-ONLY
- 	to UNIX permission bits (such as the <a class="indexterm" name="id2536336"></a>map hidden. Instead, DOS attributes will be stored onto an extended
+ </p></dd><dt><span class="term"><a name="STOREDOSATTRIBUTES"></a>store dos attributes (S)</span></dt><dd><p>
+ 	If this parameter is set Samba attempts to first read DOS attributes (SYSTEM, HIDDEN, ARCHIVE or
+ 	READ-ONLY) from a filesystem extended attribute, before mapping DOS attributes to UNIX permission bits (such
diff --git a/net/samba/patches/patch-bu b/net/samba/patches/patch-bu
index e60d8f445aa..e8cadbfe927 100644
--- a/net/samba/patches/patch-bu
+++ b/net/samba/patches/patch-bu
@@ -1,8 +1,8 @@
-$NetBSD: patch-bu,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-bu,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- ../docs/manpages/smb.conf.5.orig	2005-08-19 13:53:26.000000000 -0400
+--- ../docs/manpages/smb.conf.5.orig	2005-12-29 11:19:48.000000000 -0500
 +++ ../docs/manpages/smb.conf.5
-@@ -2963,6 +2963,12 @@ This integer specifies the number of sec
+@@ -3093,6 +3093,12 @@ This integer specifies the number of sec
  Default: \fB\fIpasswd chat timeout\fR = 2 \fR 
  
  .TP
@@ -15,7 +15,7 @@ $NetBSD: patch-bu,v 1.1 2005/11/14 08:05:28 jlam Exp $
  passwd program (G)
  The name of a program that can be used to set UNIX user passwords\&. Any occurrences of \fI%u\fR will be replaced with the user name\&. The user name is checked for existence before calling the password changing program\&.
  
-@@ -3923,6 +3929,15 @@ This parameter determines if \fBsmbd\fR(
+@@ -4075,6 +4081,15 @@ This parameter determines if \fBsmbd\fR(
  Default: \fB\fIstat cache\fR = yes \fR 
  
  .TP
@@ -29,5 +29,5 @@ $NetBSD: patch-bu,v 1.1 2005/11/14 08:05:28 jlam Exp $
 +
 +.TP
  store dos attributes (S)
- If this parameter is set Samba no longer attempts to map DOS attributes like SYSTEM, HIDDEN, ARCHIVE or READ\-ONLY to UNIX permission bits (such as the map hidden\&. Instead, DOS attributes will be stored onto an extended attribute in the UNIX filesystem, associated with the file or directory\&. For this to operate correctly, the parameters map hidden, map system, map archive must be set to off\&. This parameter writes the DOS attributes as a string into the extended attribute named "user\&.DOSATTRIB"\&. This extended attribute is explicitly hidden from smbd clients requesting an EA list\&. On Linux the filesystem must have been mounted with the mount option user_xattr in order for extended attributes to work, also extended attributes must be compiled into the Linux kernel\&.
+ If this parameter is set Samba attempts to first read DOS attributes (SYSTEM, HIDDEN, ARCHIVE or READ\-ONLY) from a filesystem extended attribute, before mapping DOS attributes to UNIX permission bits (such as occurs with map hidden and map readonly)\&. When set, DOS attributes will be stored onto an extended attribute in the UNIX filesystem, associated with the file or directory\&. For no other mapping to occur as a fall\-back, the parameters map hidden,map system, map archive and map readonly must be set to off\&. This parameter writes the DOS attributes as a string into the extended attribute named "user\&.DOSATTRIB"\&. This extended attribute is explicitly hidden from smbd clients requesting an EA list\&. On Linux the filesystem must have been mounted with the mount option user_xattr in order for extended attributes to work, also extended attributes must be compiled into the Linux kernel\&.
  
diff --git a/net/samba/patches/patch-bw b/net/samba/patches/patch-bw
index f2395b69ae6..aef90a13173 100644
--- a/net/samba/patches/patch-bw
+++ b/net/samba/patches/patch-bw
@@ -1,10 +1,10 @@
-$NetBSD: patch-bw,v 1.1 2005/11/14 08:05:28 jlam Exp $
+$NetBSD: patch-bw,v 1.2 2006/01/02 22:33:36 jlam Exp $
 
---- include/config.h.in.orig	2005-10-12 22:20:00.000000000 -0400
+--- include/config.h.in.orig	2005-12-29 18:50:49.000000000 -0500
 +++ include/config.h.in
-@@ -244,9 +244,6 @@
- /* Whether we have CUPS */
- #undef HAVE_CUPS
+@@ -250,9 +250,6 @@
+ /* Define to 1 if you have the `decode_krb5_ap_req' function. */
+ #undef HAVE_DECODE_KRB5_AP_REQ
  
 -/* Define to 1 if you have the `des_set_key' function. */
 -#undef HAVE_DES_SET_KEY
@@ -12,9 +12,9 @@ $NetBSD: patch-bw,v 1.1 2005/11/14 08:05:28 jlam Exp $
  /* Whether the 'dev64_t' type is available */
  #undef HAVE_DEV64_T
  
-@@ -305,6 +302,9 @@
- /* Whether errno() is available */
- #undef HAVE_ERRNO_DECL
+@@ -314,6 +311,9 @@
+ /* Whether the EncryptedData struct has a etype property */
+ #undef HAVE_ETYPE_IN_ENCRYPTEDDATA
  
 +/* Define to 1 if you have the `EVP_des_cbc' function. */
 +#undef HAVE_EVP_DES_CBC
@@ -22,7 +22,7 @@ $NetBSD: patch-bw,v 1.1 2005/11/14 08:05:28 jlam Exp $
  /* Define to 1 if you have the <execinfo.h> header file. */
  #undef HAVE_EXECINFO_H
  
-@@ -449,6 +449,9 @@
+@@ -461,6 +461,9 @@
  /* Define to 1 if you have the `getpwanam' function. */
  #undef HAVE_GETPWANAM
  
diff --git a/net/samba/patches/patch-ca b/net/samba/patches/patch-ca
deleted file mode 100644
index 411cdd0064b..00000000000
--- a/net/samba/patches/patch-ca
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2005/11/14 08:05:28 jlam Exp $
-
---- passdb/pdb_ldap.c.orig	2005-10-12 13:03:35.000000000 -0400
-+++ passdb/pdb_ldap.c
-@@ -694,7 +694,7 @@ static BOOL init_sam_from_ldap(struct ld
- 
- 	if (ldap_state->is_nds_ldap) {
- 		char *user_dn;
--		int pwd_len;
-+		size_t pwd_len;
- 		char clear_text_pw[512];
- 
- 		/* Make call to Novell eDirectory ldap extension to get clear text password.
diff --git a/net/samba/patches/patch-cb b/net/samba/patches/patch-cb
deleted file mode 100644
index af630b8b2aa..00000000000
--- a/net/samba/patches/patch-cb
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2005/11/14 08:05:28 jlam Exp $
-
---- rpc_server/srv_reg_nt.c.orig	2005-10-12 13:03:33.000000000 -0400
-+++ rpc_server/srv_reg_nt.c
-@@ -66,7 +66,7 @@ SEC_DESC* construct_registry_sd( TALLOC_
- 	size_t i = 0;
- 	SEC_DESC *sd;
- 	SEC_ACL *acl;
--	uint32 sd_size;
-+	size_t sd_size;
- 
- 	/* basic access for Everyone */
- 	
-@@ -987,7 +987,7 @@ static WERROR make_default_reg_sd( TALLO
- 	SEC_ACE ace[2];         /* at most 2 entries */
- 	SEC_ACCESS mask;
- 	SEC_ACL *psa = NULL;
--	uint32 sd_size;
-+	size_t sd_size;
- 
- 	/* set the owner to BUILTIN\Administrator */
- 
diff --git a/net/samba/patches/patch-cc b/net/samba/patches/patch-cc
deleted file mode 100644
index 5026936ba64..00000000000
--- a/net/samba/patches/patch-cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2005/11/14 08:05:28 jlam Exp $
-
---- rpc_server/srv_svcctl_nt.c.orig	2005-10-12 13:03:34.000000000 -0400
-+++ rpc_server/srv_svcctl_nt.c
-@@ -81,7 +81,7 @@ static SEC_DESC* construct_scm_sd( TALLO
- 	size_t i = 0;
- 	SEC_DESC *sd;
- 	SEC_ACL *acl;
--	uint32 sd_size;
-+	size_t sd_size;
- 
- 	/* basic access for Everyone */
- 	
-@@ -115,7 +115,7 @@ static SEC_DESC* construct_service_sd( T
- 	size_t i = 0;
- 	SEC_DESC *sd;
- 	SEC_ACL *acl;
--	uint32 sd_size;
-+	size_t sd_size;
- 
- 	/* basic access for Everyone */
-