Fix patch for negprot.c to address problems with Windows XP authentication.

Fixed prototype recognition in the configure script.

PR:		151887

3 files changed, 29 insertions, 34 deletions

diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 793b7096150b..3330b6ea8fd3 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		${SAMBA_BASENAME}35
 PORTVERSION=		3.5.6
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions rc pre
@@ -16,7 +16,7 @@ DISTNAME=		${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alph
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
-CONFLICTS?=		ja-samba-[23].* samba-[23].* sharity-light-1.*
+CONFLICTS?=		*samba3[0-4]-3.* sharity-light-1.*
 # Additional patches from Sernet.de
 PATCH_STRIP=		-p1
 EXTRA_PATCHES=		${PATCHDIR}/sernet.patch
@@ -153,6 +153,8 @@ CONFIGURE_ARGS+=	--with-pam --with-readline=/usr \
 			--without-libnetapi \
 			--without-libsmbsharemodes
 
+# XXX: Temporary hack for RELENG6
+CONFIGURE_ENV+=		ac_cv_header_sys_mount_h=yes
 .if !defined(WITH_IPV6)
 CONFIGURE_ENV+=		libreplace_cv_HAVE_IPV6=no
 .endif
@@ -364,8 +366,7 @@ MAN3=		ldb.3
 MAN5=		lmhosts.5 smb.conf.5 smbgetrc.5 smbpasswd.5
 MAN7=		samba.7
 MAN8=		eventlogadm.8 net.8 nmbd.8 pdbedit.8 smbd.8 smbpasswd.8 \
-		smbspool.8 \
-		idmap_nss.8 idmap_tdb.8 idmap_tdb2.8 \
+		smbspool.8 idmap_nss.8 idmap_tdb.8 idmap_tdb2.8 \
 		vfs_acl_tdb.8 vfs_acl_xattr.8 \
 		vfs_audit.8 vfs_cap.8 vfs_default_quota.8 vfs_extd_audit.8 \
 		vfs_fake_perms.8 vfs_full_audit.8 vfs_netatalk.8 \
diff --git a/net/samba35/files/patch-lib__replace__libreplace_macros.m4 b/net/samba35/files/patch-lib__replace__libreplace_macros.m4
new file mode 100644
index 000000000000..9fb8e1e78a19
--- /dev/null
+++ b/net/samba35/files/patch-lib__replace__libreplace_macros.m4
@@ -0,0 +1,18 @@
+--- ./lib/replace/libreplace_macros.m4.orig	2010-10-07 18:41:16.000000000 +0200
++++ ./lib/replace/libreplace_macros.m4	2010-11-15 03:29:16.000000000 +0100
+@@ -293,12 +293,12 @@
+ 			$2
+ 		}
+ 	])],[
+-		AS_TR_SH([ac_cv_c_prototype_$1])=yes
++		eval AS_TR_SH([ac_cv_c_prototype_$1])=yes
+ 	],[
+-		AS_TR_SH([ac_cv_c_prototype_$1])=no
++		eval AS_TR_SH([ac_cv_c_prototype_$1])=no
+ 	])
+ )
+-AS_IF([test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4])
++AS_IF([eval test \$AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4])
+ ])
+ 
+ AC_DEFUN(LIBREPLACE_PROVIDE_HEADER, 
diff --git a/net/samba35/files/patch-source3__smbd__negprot.c b/net/samba35/files/patch-source3__smbd__negprot.c
index 10a4d418664c..29a24846cfea 100644
--- a/net/samba35/files/patch-source3__smbd__negprot.c
+++ b/net/samba35/files/patch-source3__smbd__negprot.c
@@ -1,35 +1,11 @@
---- ./source3/smbd/negprot.c.orig	2010-10-26 02:46:36.000000000 +0200
-+++ ./source3/smbd/negprot.c	2010-10-26 02:53:28.000000000 +0200
-@@ -28,27 +28,25 @@
- {
- 	NTSTATUS nt_status;
- 	struct smbd_server_connection *sconn = smbd_server_conn;
-+	struct auth_context *actx = sconn->smb1.negprot.auth_context;
- 
- 	/* We might be called more than once, multiple negprots are
- 	 * permitted */
--	if (sconn->smb1.negprot.auth_context) {
-+	if (actx) {
+--- ./source3/smbd/negprot.c.orig	2010-10-07 18:41:16.000000000 +0200
++++ ./source3/smbd/negprot.c	2010-11-14 03:46:55.000000000 +0100
+@@ -34,7 +34,7 @@
+ 	if (sconn->smb1.negprot.auth_context) {
  		DEBUG(3, ("get challenge: is this a secondary negprot? "
  			  "sconn->negprot.auth_context is non-NULL!\n"));
 -			sconn->smb1.negprot.auth_context->free(
--				&sconn->smb1.negprot.auth_context);
-+			(actx->free)(&actx);
- 	}
- 
- 	DEBUG(10, ("get challenge: creating negprot_global_auth_context\n"));
--	nt_status = make_auth_context_subsystem(
--		&sconn->smb1.negprot.auth_context);
-+	nt_status = make_auth_context_subsystem(&actx);
- 	if (!NT_STATUS_IS_OK(nt_status)) {
- 		DEBUG(0, ("make_auth_context_subsystem returned %s",
- 			  nt_errstr(nt_status)));
- 		smb_panic("cannot make_negprot_global_auth_context!");
++			(sconn->smb1.negprot.auth_context)->free(
+ 				&sconn->smb1.negprot.auth_context);
  	}
- 	DEBUG(10, ("get challenge: getting challenge\n"));
--	sconn->smb1.negprot.auth_context->get_ntlm_challenge(
--		sconn->smb1.negprot.auth_context, buff);
-+	actx->get_ntlm_challenge(actx, buff);
- }
  
- /****************************************************************************