Changes 3.5.8:

* Fix Winbind crash bug when no DC is available
* Fix finding users on domain members
* Fix memory leaks in Winbind
* Fix printing with Windows 7 clients

5 files changed, 23 insertions, 44 deletions

diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 5b8b6b82458..20cade632e7 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/03/01 11:28:59 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2011/03/08 08:30:07 adam Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.samba.org/
 COMMENT=	SMB/CIFS protocol server suite
 LICENSE=	gnu-gpl-v3
 
-VERSION=	3.5.7
+VERSION=	3.5.8
 CONFLICTS+=	ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/net/samba35/distinfo b/net/samba35/distinfo
index 9c9bb80427b..047d5d47be1 100644
--- a/net/samba35/distinfo
+++ b/net/samba35/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.2 2011/02/28 14:34:56 taca Exp $
+$NetBSD: distinfo,v 1.3 2011/03/08 08:30:07 adam Exp $
 
-SHA1 (samba-3.5.7.tar.gz) = 335c6e97858f0a6db5559a398c980df39a5f6f7c
-RMD160 (samba-3.5.7.tar.gz) = f903a40aeffffa0ca142cfce3bb4ecced5c0bc29
-Size (samba-3.5.7.tar.gz) = 30815040 bytes
-SHA1 (patch-aa) = 7a007f347752782a0a60468d3dcb1ac37065445a
+SHA1 (samba-3.5.8.tar.gz) = ffb71de38442eee14aafb44f819671354dc5cce9
+RMD160 (samba-3.5.8.tar.gz) = 02703bbaf7d7e7b9786a2228fe6085143c99251a
+Size (samba-3.5.8.tar.gz) = 30721269 bytes
 SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
 SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032
 SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971
 SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958
-SHA1 (patch-af) = a87cf7c3ef4b75ac5d99034cc521bd7041770af2
+SHA1 (patch-af) = 16cac48a004ce77c3e58b7ac3a492d61e2f2c36a
 SHA1 (patch-ag) = 92fd576c4b05a913051925e461cde9f5a2f2d6bf
 SHA1 (patch-ah) = ce4529a6f0afcc8a14bdd6ad4fc86c5c097cfef0
 SHA1 (patch-ai) = 7dc10895549439f87b8a62458878fd8c766dadb7
@@ -19,7 +18,7 @@ SHA1 (patch-am) = 13744f8a5cce3016c37002079eba3c47077e8d6d
 SHA1 (patch-an) = a9b31b791d979a1062006bbe55375aaab69210a1
 SHA1 (patch-ao) = bc31d3003bdaad141652daff2e0b6b3cafcee8c1
 SHA1 (patch-ap) = 3a47d212b1c29a6b3c46b83903c4f011c28a8c3c
-SHA1 (patch-aq) = 09adfab1c047bb71af21a4a9689725fa8f42fcf7
+SHA1 (patch-aq) = a8b1084c6dab6102847cc4686bd53d9f3186fc43
 SHA1 (patch-ar) = 5213b0a3d95d106939c2e268a8538c5e2901079a
 SHA1 (patch-as) = a9fcb1813d55d598bf1226cf004de85701c93e61
 SHA1 (patch-at) = dcfbe79496065559380e5713a758816e538e728b
diff --git a/net/samba35/patches/patch-aa b/net/samba35/patches/patch-aa
deleted file mode 100644
index 530130b65c8..00000000000
--- a/net/samba35/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $
-
---- ../docs/manpages/smb.conf.5.orig	2010-06-18 08:11:31.000000000 +0000
-+++ ../docs/manpages/smb.conf.5
-@@ -7698,6 +7698,15 @@ Example:
- \fI\fIpasswd chat\fR\fR\fI = \fR\fI\FC"*Enter NEW password*" %n\en "*Reenter NEW password*" %n\en "*Password changed*"\F[]\fR\fI \fR
- .RE
- 
-+passwd expand gecos (G)
-+.PP
-+.RS 4
-+This boolean specifies if ampersand characters in the GECOS field of a passwd database entry should be replaced with the capitalized login name for that entry when the information is used by various Samba programs\&. This parameter is off by default\&.
-+.sp
-+Default: \fB\fIpasswd expand gecos\fR = no \fR 
-+.TP 3n
-+.sp
-+
- passwd program (G)
- .\" passwd program
- .PP
diff --git a/net/samba35/patches/patch-af b/net/samba35/patches/patch-af
index ea87ddebc2b..482e9c339c5 100644
--- a/net/samba35/patches/patch-af
+++ b/net/samba35/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $
+$NetBSD: patch-af,v 1.2 2011/03/08 08:30:07 adam Exp $
 
---- configure.orig	2010-10-07 16:42:24.000000000 +0000
+--- configure.orig	2011-03-06 18:58:41.000000000 +0000
 +++ configure
-@@ -52166,6 +52166,7 @@ _ACEOF
+@@ -52168,6 +52168,7 @@ _ACEOF
  
  			BLDSHARED="true"
  			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $
  			CFLAGS="$CFLAGS -fno-common"
  			SHLD="\${CC}"
  			SHLIBEXT="dylib"
-@@ -52206,7 +52206,7 @@ fi
+@@ -52208,7 +52209,7 @@ fi
  $as_echo "$BLDSHARED" >&6; }
  
  saved_before_as_needed_ldflags="$LDFLAGS"
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $
  	saved_ldflags="$LDFLAGS"
  	{ $as_echo "$as_me:$LINENO: checking if $flags works" >&5
  $as_echo_n "checking if $flags works... " >&6; }
-@@ -65398,9 +65398,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
+@@ -65482,9 +65483,9 @@ LIBS="-lcrypto $KRB5_LIBS  $LIBS"
  
  
  
@@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -65416,11 +65416,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -65500,11 +65501,11 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -46,7 +46,7 @@ $NetBSD: patch-af,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $
    ;
    return 0;
  }
-@@ -65446,13 +65446,13 @@ $as_echo "$ac_try_echo") >&5
+@@ -65530,13 +65531,13 @@ $as_echo "$ac_try_echo") >&5
  	 test "$cross_compiling" = yes ||
  	 $as_test_x conftest$ac_exeext
         }; then
@@ -62,7 +62,7 @@ $NetBSD: patch-af,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $
  		  ac_cv_lib_ext_crypto=no
  fi
  
-@@ -65461,11 +65461,11 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -65545,11 +65546,11 @@ rm -f core conftest.err conftest.$ac_obj
        conftest$ac_exeext conftest.$ac_ext
  
  fi
@@ -78,7 +78,7 @@ $NetBSD: patch-af,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $
  _ACEOF
  
  fi
-@@ -81610,31 +81610,39 @@ case "$host_os" in
+@@ -81694,31 +81695,39 @@ case "$host_os" in
  		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="../nsswitch/winbind_nss_linux.o"
  		;;
diff --git a/net/samba35/patches/patch-aq b/net/samba35/patches/patch-aq
index 6471f9139a5..976f268e302 100644
--- a/net/samba35/patches/patch-aq
+++ b/net/samba35/patches/patch-aq
@@ -1,10 +1,10 @@
-$NetBSD: patch-aq,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $
+$NetBSD: patch-aq,v 1.2 2011/03/08 08:30:08 adam Exp $
 
 Add support for passwd expand gecos
 
---- param/loadparm.c.orig	2010-02-25 09:46:35.000000000 +0000
+--- param/loadparm.c.orig	2011-03-06 18:48:05.000000000 +0000
 +++ param/loadparm.c
-@@ -297,6 +298,7 @@ struct global {
+@@ -310,6 +310,7 @@ struct global {
  	bool bUnixPasswdSync;
  	bool bPasswdChatDebug;
  	int iPasswdChatTimeout;
@@ -12,7 +12,7 @@ Add support for passwd expand gecos
  	bool bTimestampLogs;
  	bool bNTSmbSupport;
  	bool bNTPipeSupport;
-@@ -1248,6 +1250,15 @@ static struct parm_struct parm_table[] =
+@@ -1296,6 +1297,15 @@ static struct parm_struct parm_table[] =
  		.flags		= FLAG_ADVANCED,
  	},
  	{
@@ -28,7 +28,7 @@ Add support for passwd expand gecos
  		.label		= "check password script",
  		.type		= P_STRING,
  		.p_class	= P_GLOBAL,
-@@ -4759,6 +4780,7 @@ static void init_globals(bool first_time
+@@ -5064,6 +5074,7 @@ static void init_globals(bool first_time
  	Globals.bPamPasswordChange = False;
  	Globals.bPasswdChatDebug = False;
  	Globals.iPasswdChatTimeout = 2; /* 2 second default. */
@@ -36,7 +36,7 @@ Add support for passwd expand gecos
  	Globals.bNTPipeSupport = True;	/* Do NT pipes by default. */
  	Globals.bNTStatusSupport = True; /* Use NT status by default. */
  	Globals.bStatCache = True;	/* use stat cache by default */
-@@ -5178,6 +5201,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, &
+@@ -5518,6 +5529,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)