Update "samba" package to version 3.0.10. Changes since version 3.0.9:

- Added checks surrounding all *alloc() calls to fix CAN-2004-1154.
- Fix long standing memory size bug in bitmap_allocate().
- Remove bogus error check in deferred open file serving
  code.
- Fix autoconf script on platforms using a version of GNU ld
  that does not include a date stamp in the output of --version.
- Fix the swat install script to deal with the new image
  destination directory used by the docs.

4 files changed, 106 insertions, 106 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index ea2eee86a5e..8c9978eff7a 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.135 2004/11/30 15:24:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.136 2004/12/17 18:55:47 tron Exp $
 
-DISTNAME=		samba-3.0.9
+DISTNAME=		samba-3.0.10
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.samba.org/pub/samba/old-versions/ \
 			ftp://ring.asahi-net.or.jp/pub/net/samba/old-versions/ \
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 0f316c05886..4d2d51c6acf 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2004/11/30 15:24:43 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.28 2004/12/17 18:55:47 tron Exp $
 bin/findsmb
 bin/net
 bin/nmblookup
@@ -85,6 +85,7 @@ man/man7/samba.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
@@ -153,50 +154,17 @@ 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/AccountingNetwork.png
 share/samba/swat/help/Samba-Guide/Big500users.html
-share/samba/swat/help/Samba-Guide/Charity-Network.png
 share/samba/swat/help/Samba-Guide/DomApps.html
 share/samba/swat/help/Samba-Guide/HA.html
-share/samba/swat/help/Samba-Guide/HostAnnouncment.png
-share/samba/swat/help/Samba-Guide/NullConnect.png
-share/samba/swat/help/Samba-Guide/UNIX-Samba-and-LDAP.png
-share/samba/swat/help/Samba-Guide/UserConnect.png
-share/samba/swat/help/Samba-Guide/UserMgrNT4.png
-share/samba/swat/help/Samba-Guide/WINREPRESSME-Capture.png
-share/samba/swat/help/Samba-Guide/WINREPRESSME-Capture2.png
-share/samba/swat/help/Samba-Guide/WindowsXP-NullConnection.png
-share/samba/swat/help/Samba-Guide/WindowsXP-UserConnection.png
-share/samba/swat/help/Samba-Guide/XP-screen001.png
-share/samba/swat/help/Samba-Guide/acct2net.png
 share/samba/swat/help/Samba-Guide/appendix.html
-share/samba/swat/help/Samba-Guide/ch7-dual-additive-LDAP-Ok.png
-share/samba/swat/help/Samba-Guide/ch7-dual-additive-LDAP.png
-share/samba/swat/help/Samba-Guide/ch7-fail-overLDAP.png
-share/samba/swat/help/Samba-Guide/ch7-singleLDAP.png
-share/samba/swat/help/Samba-Guide/ch8-migration.png
-share/samba/swat/help/Samba-Guide/chap4-net.png
-share/samba/swat/help/Samba-Guide/chap5-net.png
-share/samba/swat/help/Samba-Guide/chap6-net.png
-share/samba/swat/help/Samba-Guide/chap7-idresol.png
-share/samba/swat/help/Samba-Guide/chap7-net-Ar.png
-share/samba/swat/help/Samba-Guide/chap7-net2-Br.png
-share/samba/swat/help/Samba-Guide/chap9-ADSDC.png
-share/samba/swat/help/Samba-Guide/chap9-SambaDC.png
 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/index.html
 share/samba/swat/help/Samba-Guide/ix01.html
 share/samba/swat/help/Samba-Guide/kerberos.html
-share/samba/swat/help/Samba-Guide/lam-config.png
-share/samba/swat/help/Samba-Guide/lam-group-members.png
-share/samba/swat/help/Samba-Guide/lam-groups.png
-share/samba/swat/help/Samba-Guide/lam-hosts.png
-share/samba/swat/help/Samba-Guide/lam-login.png
-share/samba/swat/help/Samba-Guide/lam-users.png
 share/samba/swat/help/Samba-Guide/migration.html
-share/samba/swat/help/Samba-Guide/openmag.png
 share/samba/swat/help/Samba-Guide/pr01.html
 share/samba/swat/help/Samba-Guide/pr02.html
 share/samba/swat/help/Samba-Guide/pr03.html
@@ -206,25 +174,44 @@ 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-Guide/wxpp001.png
-share/samba/swat/help/Samba-Guide/wxpp004.png
-share/samba/swat/help/Samba-Guide/wxpp006.png
-share/samba/swat/help/Samba-Guide/wxpp007.png
-share/samba/swat/help/Samba-Guide/wxpp008.png
-share/samba/swat/help/Samba-HOWTO-Collection/10small.png
-share/samba/swat/help/Samba-HOWTO-Collection/11small.png
-share/samba/swat/help/Samba-HOWTO-Collection/12small.png
-share/samba/swat/help/Samba-HOWTO-Collection/13small.png
-share/samba/swat/help/Samba-HOWTO-Collection/14small.png
-share/samba/swat/help/Samba-HOWTO-Collection/1small.png
-share/samba/swat/help/Samba-HOWTO-Collection/2small.png
-share/samba/swat/help/Samba-HOWTO-Collection/3small.png
-share/samba/swat/help/Samba-HOWTO-Collection/4small.png
-share/samba/swat/help/Samba-HOWTO-Collection/5small.png
-share/samba/swat/help/Samba-HOWTO-Collection/6small.png
-share/samba/swat/help/Samba-HOWTO-Collection/7small.png
-share/samba/swat/help/Samba-HOWTO-Collection/8small.png
-share/samba/swat/help/Samba-HOWTO-Collection/9small.png
+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-HOWTO-Collection/AccessControls.html
 share/samba/swat/help/Samba-HOWTO-Collection/AdvancedNetworkManagement.html
 share/samba/swat/help/Samba-HOWTO-Collection/Appendix.html
@@ -246,40 +233,13 @@ 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/WME001.png
-share/samba/swat/help/Samba-HOWTO-Collection/WME002.png
-share/samba/swat/help/Samba-HOWTO-Collection/WME003.png
-share/samba/swat/help/Samba-HOWTO-Collection/WME005.png
-share/samba/swat/help/Samba-HOWTO-Collection/WME009.png
-share/samba/swat/help/Samba-HOWTO-Collection/WME010.png
-share/samba/swat/help/Samba-HOWTO-Collection/WME013.png
-share/samba/swat/help/Samba-HOWTO-Collection/WME014.png
-share/samba/swat/help/Samba-HOWTO-Collection/WXPP002.png
-share/samba/swat/help/Samba-HOWTO-Collection/WXPP003.png
-share/samba/swat/help/Samba-HOWTO-Collection/WXPP005.png
-share/samba/swat/help/Samba-HOWTO-Collection/WXPP009.png
-share/samba/swat/help/Samba-HOWTO-Collection/WXPP014.png
-share/samba/swat/help/Samba-HOWTO-Collection/a_small.png
-share/samba/swat/help/Samba-HOWTO-Collection/access1.png
-share/samba/swat/help/Samba-HOWTO-Collection/browsing1.png
 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/cups1.png
-share/samba/swat/help/Samba-HOWTO-Collection/cups2.png
 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/domain.png
-share/samba/swat/help/Samba-HOWTO-Collection/ethereal1.png
-share/samba/swat/help/Samba-HOWTO-Collection/ethereal2.png
 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/idmap-gid2sid.png
-share/samba/swat/help/Samba-HOWTO-Collection/idmap-sid2gid.png
-share/samba/swat/help/Samba-HOWTO-Collection/idmap-sid2uid.png
-share/samba/swat/help/Samba-HOWTO-Collection/idmap-store-gid2sid.png
-share/samba/swat/help/Samba-HOWTO-Collection/idmap-uid2sid.png
-share/samba/swat/help/Samba-HOWTO-Collection/idmap_winbind_no_loop.png
 share/samba/swat/help/Samba-HOWTO-Collection/idmapper.html
 share/samba/swat/help/Samba-HOWTO-Collection/index.html
 share/samba/swat/help/Samba-HOWTO-Collection/install.html
@@ -292,8 +252,6 @@ 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/pdftoepsonusb.png
-share/samba/swat/help/Samba-HOWTO-Collection/pdftosocket.png
 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
@@ -304,21 +262,64 @@ 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/trusts1.png
 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/w2kp001.png
-share/samba/swat/help/Samba-HOWTO-Collection/w2kp002.png
-share/samba/swat/help/Samba-HOWTO-Collection/w2kp003.png
-share/samba/swat/help/Samba-HOWTO-Collection/w2kp004.png
-share/samba/swat/help/Samba-HOWTO-Collection/w2kp005.png
 share/samba/swat/help/Samba-HOWTO-Collection/winbind.html
-share/samba/swat/help/Samba-HOWTO-Collection/wxpp001.png
-share/samba/swat/help/Samba-HOWTO-Collection/wxpp004.png
-share/samba/swat/help/Samba-HOWTO-Collection/wxpp006.png
-share/samba/swat/help/Samba-HOWTO-Collection/wxpp007.png
-share/samba/swat/help/Samba-HOWTO-Collection/wxpp008.png
+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/editreg.1.html
 share/samba/swat/help/findsmb.1.html
 share/samba/swat/help/index.html
@@ -330,6 +331,7 @@ 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
@@ -561,10 +563,8 @@ share/samba/swat/using_samba/toc.html
 @dirrm share/samba/swat/images
 @exec ${MKDIR} %D/share/samba/swat/help/images
 @dirrm share/samba/swat/help/images
-@exec ${MKDIR} %D/share/samba/swat/help/Samba-HOWTO-Collection/images
 @dirrm share/samba/swat/help/Samba-HOWTO-Collection/images
 @dirrm share/samba/swat/help/Samba-HOWTO-Collection
-@exec ${MKDIR} %D/share/samba/swat/help/Samba-Guide/images
 @dirrm share/samba/swat/help/Samba-Guide/images
 @dirrm share/samba/swat/help/Samba-Guide
 @exec ${MKDIR} %D/share/samba/swat/help/Samba-Developers-Guide/images
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 410eb64077a..9f102da0618 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.39 2004/11/30 15:24:43 xtraeme Exp $
+$NetBSD: distinfo,v 1.40 2004/12/17 18:55:47 tron Exp $
 
-SHA1 (samba-3.0.9.tar.gz) = ce957e779a3c9087e94e3513905e57c8a5453f58
-Size (samba-3.0.9.tar.gz) = 15172821 bytes
+SHA1 (samba-3.0.10.tar.gz) = 1cb80bbd9feb7da85aac64bd308a52c662b1cc8a
+Size (samba-3.0.10.tar.gz) = 15176926 bytes
 SHA1 (patch-ab) = c5f352a07774b8e2873c2ac3b3de3ba4cb12bf5e
 SHA1 (patch-ac) = fc0d15f371a9c3544499f6a6cd830b52b34ff644
-SHA1 (patch-ad) = b75770eb6fc7ff5d26764fced83e26fd6cf153af
+SHA1 (patch-ad) = 8a99e5f898eb3c466b07b5bbb9f0c7e28e385ea0
 SHA1 (patch-ae) = cf3a040f04142df534abe54b66156a48697b665d
 SHA1 (patch-af) = bc0cead8f8350001e5291443821e875bab540fc3
 SHA1 (patch-ag) = cce908577cf4007bb00b15f6dd7eee7d549ac5b0
diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad
index 72b2352a7d1..afe6f795ad1 100644
--- a/net/samba/patches/patch-ad
+++ b/net/samba/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.14 2004/02/17 11:51:54 jlam Exp $
+$NetBSD: patch-ad,v 1.15 2004/12/17 18:55:47 tron Exp $
 
 --- lib/util_getent.c.orig	Fri Feb 13 11:02:10 2004
 +++ lib/util_getent.c
@@ -12,7 +12,7 @@ $NetBSD: patch-ad,v 1.14 2004/02/17 11:51:54 jlam Exp $
 +	int buflen;
 +#endif
  	
- 	pent = (struct sys_pwent *) malloc(sizeof(struct sys_pwent));
+ 	pent = SMB_MALLOC_P(struct sys_pwent);
  	if (pent == NULL) {
 @@ -156,9 +161,38 @@ struct sys_pwent * getpwent_list(void)
  		pent->pw_uid = pwd->pw_uid;
@@ -40,10 +40,10 @@ $NetBSD: patch-ad,v 1.14 2004/02/17 11:51:54 jlam Exp $
 +				}
 +			}
 +			*bp = '\0';
-+			if ((pent->pw_gecos = strdup(buf)) == NULL)
++			if ((pent->pw_gecos = SMB_STRDUP(buf)) == NULL)
 +				goto err;
 +#else
- 			if ((pent->pw_gecos = strdup(pwd->pw_gecos)) == NULL)
+ 			if ((pent->pw_gecos = SMB_STRDUP(pwd->pw_gecos)) == NULL)
  				goto err;
 +#endif
  		}
@@ -51,5 +51,5 @@ $NetBSD: patch-ad,v 1.14 2004/02/17 11:51:54 jlam Exp $
 +  gecos_done:
 +#endif
  		if (pwd->pw_dir) {
- 			if ((pent->pw_dir = strdup(pwd->pw_dir)) == NULL)
+ 			if ((pent->pw_dir = SMB_STRDUP(pwd->pw_dir)) == NULL)
  				goto err;