more cruft removal -- this time unused patches

(Portage version: 2.0.51.19)

13 files changed, 13 insertions, 657 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 7a97e160b425..bb07f7ebfdad 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.159 2005/04/13 11:43:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.160 2005/04/13 11:54:54 seemant Exp $
+
+  13 Apr 2005; Seemant Kulleen <seemant@gentoo.org>
+  -files/samba-2.2.5-gp-reloc-fix.patch, -files/samba-2.2.6-libresolv.patch,
+  -files/samba-2.2.8-statfs.patch, -files/samba-3.0.0-python-setup.patch,
+  -files/samba-3.0.2a-smbprint.patch,
+  -files/samba-3.0.6-homes-reuse_v2.patch,
+  -files/samba-3.0.6-libdirsymlink.patch,
+  -files/samba-3.0.6-winbind_getpwnam_v1.patch,
+  -files/samba-3.0.8-lanman.patch,
+  -files/samba-3.0.9-util.c-bitpmap.c-4120.patch, -files/samba-3.0.x.patch,
+  -files/samba-pdb_ldap-exop.patch:
+  more cruft removal -- this time unused patches
 
   13 Apr 2005; Seemant Kulleen <seemant@gentoo.org> -samba-3.0.6-r3.ebuild,
   -samba-3.0.6-r4.ebuild, -samba-3.0.7.ebuild, -samba-3.0.7-r1.ebuild,
diff --git a/net-fs/samba/files/samba-2.2.5-gp-reloc-fix.patch b/net-fs/samba/files/samba-2.2.5-gp-reloc-fix.patch
deleted file mode 100644
index 894c4e701484..000000000000
--- a/net-fs/samba/files/samba-2.2.5-gp-reloc-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur samba-2.2.5.orig/examples/VFS/Makefile.in samba-2.2.5/examples/VFS/Makefile.in
---- samba-2.2.5.orig/examples/VFS/Makefile.in   2002-06-17 20:35:09.000000000 +0200
-+++ samba-2.2.5/examples/VFS/Makefile.in        2002-06-30 16:43:15.000000000 +0200
-@@ -4,7 +4,7 @@
- 
- CC=@CC@
- LIBTOOL=@LIBTOOL@
--CFLAGS=@CFLAGS@
-+CFLAGS=@CFLAGS@ -DPIC -fPIC
- LDFLAGS=@LDFLAGS@
- 
- VFS_OBJS=audit.so skel.so block/block.so recycle/recycle.so
-
diff --git a/net-fs/samba/files/samba-2.2.6-libresolv.patch b/net-fs/samba/files/samba-2.2.6-libresolv.patch
deleted file mode 100644
index 68da94962a64..000000000000
--- a/net-fs/samba/files/samba-2.2.6-libresolv.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- source/configure.in.orig	2002-10-26 15:49:04.000000000 -0500
-+++ source/configure.in	2002-10-26 15:49:51.000000000 -0500
-@@ -2088,6 +2088,7 @@
-     AC_DEFINE(WITH_LDAP_SAM)
-     LDAPLIBS="-lldap"
-     AC_CHECK_LIB(lber, ber_bvfree, [LDAPLIBS="$LDAPLIBS -llber"])
-+    AC_CHECK_LIB(resolv, __res_query, [LDAPLIBS="-lresolv $LDAPLIBS"])
-     ## remove -lresolv as this should be included by the -lsasl dependency 
-     ## in the OpenLDAP clients.  By not requiring it specifically, we avoid
-     ## issues on platforms that don't have it
diff --git a/net-fs/samba/files/samba-2.2.8-statfs.patch b/net-fs/samba/files/samba-2.2.8-statfs.patch
deleted file mode 100644
index ca658ae7e3df..000000000000
--- a/net-fs/samba/files/samba-2.2.8-statfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- includes.h	Fri Feb 28 07:56:18 2003
-+++ includes.h.diff	Tue Apr  1 15:39:16 2003
-@@ -276,6 +276,7 @@
- 
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
-+#define _LINUX_VFS_H 1
- #endif
- 
- #ifdef HAVE_SYS_ACL_H
diff --git a/net-fs/samba/files/samba-3.0.0-python-setup.patch b/net-fs/samba/files/samba-3.0.0-python-setup.patch
deleted file mode 100644
index 7307a3c820c4..000000000000
--- a/net-fs/samba/files/samba-3.0.0-python-setup.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- samba-3.0.0beta3/source/python/setup.py     2003-06-07 13:57:36.000000000 -0400
-+++ samba_3_0_20030720/source/python/setup.py   2003-08-10 15:52:53.000000000 -0400
-@@ -50,13 +50,22 @@
- libraries = []
- library_dirs = []
-
-+next_is_path = 0
- for lib in string.split(samba_libs):
--    if lib[0:2] == "-l":
-+    if next_is_path <> 0:
-+       library_dirs.append(lib);
-+       next_is_path = 0;
-+       continue
-+    if lib == "-Wl,-rpath":
-+       next_is_path = 1;
-+       continue
-+    elif lib[0:2] == "-l":
-         libraries.append(lib[2:])
-         continue
--    if lib[0:2] == "-L":
-+    elif lib[0:2] == "-L":
-         library_dirs.append(lib[2:])
-         continue
-+
-     print "Unknown entry '%s' in $LIBS variable passed to setup.py" % lib
-     sys.exit(1)
diff --git a/net-fs/samba/files/samba-3.0.2a-smbprint.patch b/net-fs/samba/files/samba-3.0.2a-smbprint.patch
deleted file mode 100644
index c5f3080bb335..000000000000
--- a/net-fs/samba/files/samba-3.0.2a-smbprint.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -r -u samba-3.0.2a/examples/printing/smbprint samba-3.0.2a-patched/examples/printing/smbprint
---- samba-3.0.2a/examples/printing/smbprint	2004-04-09 13:33:17.304613696 -0700
-+++ samba-3.0.2a-patched/examples/printing/smbprint	2004-04-09 14:01:05.817961112 -0700
-@@ -109,6 +109,9 @@
-         if [ $debug -eq 0 ] ; then
- 		debugfile=/dev/null debugargs=
- 	else
-+        if [ -h "$debugfile" -o ! -f "$debugfile" ]; then
-+            debugfile="/dev/null"
-+        fi
- 		set -x; exec >>$debugfile 2>&1
- 		debugargs="$debugfile."
- 		#[ "x$debugsmb" == "x" ] || debugargs="$debugargs -d $debugsmb"
-diff -r -u samba-3.0.2a/examples/printing/smbprint-new.sh samba-3.0.2a-patched/examples/printing/smbprint-new.sh
---- samba-3.0.2a/examples/printing/smbprint-new.sh	2004-04-09 13:33:24.086582680 -0700
-+++ samba-3.0.2a-patched/examples/printing/smbprint-new.sh	2004-04-09 14:01:32.791860456 -0700
-@@ -109,6 +109,9 @@
-         if [ $debug -eq 0 ] ; then
- 		debugfile=/dev/null debugargs=
- 	else
-+        if [ -h "$debugfile" -o ! -f "$debugfile" ]; then
-+            debugfile="/dev/null"
-+        fi
- 		set -x; exec >>$debugfile 2>&1
- 		debugargs="$debugfile."
- 		#[ "x$debugsmb" == "x" ] || debugargs="$debugargs -d $debugsmb"
diff --git a/net-fs/samba/files/samba-3.0.6-homes-reuse_v2.patch b/net-fs/samba/files/samba-3.0.6-homes-reuse_v2.patch
deleted file mode 100644
index e8d39b60b4d7..000000000000
--- a/net-fs/samba/files/samba-3.0.6-homes-reuse_v2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: smbd/password.c
-===================================================================
---- smbd/password.c	(revision 2069)
-+++ smbd/password.c	(working copy)
-@@ -252,27 +252,30 @@
- 	}
- 
- 	/* Register a home dir service for this user iff
-+	
- 	   (a) This is not a guest connection,
- 	   (b) we have a home directory defined 
--	   If a share exists by this name (autoloaded or not) reuse it so
--	   long as the home directory is the same as the share directory. */
-+	   (c) there s not an existing static share by that name
-+	   
-+	   If a share exists by this name (autoloaded or not) reuse it . */
- 
--	if ( (!vuser->guest) && vuser->unix_homedir && *(vuser->unix_homedir)) {
-+	vuser->homes_snum = -1;
-+
-+	if ( (!vuser->guest) && vuser->unix_homedir && *(vuser->unix_homedir)) 
-+	{
- 		int servicenumber = lp_servicenumber(vuser->user.unix_name);
-+
- 		if ( servicenumber == -1 ) {
- 			DEBUG(3, ("Adding homes service for user '%s' using home directory: '%s'\n", 
- 				vuser->user.unix_name, vuser->unix_homedir));
- 			vuser->homes_snum = add_home_service(vuser->user.unix_name, 
- 						vuser->user.unix_name, vuser->unix_homedir);
--		} else if (strcmp(lp_pathname(servicenumber),vuser->unix_homedir) == 0) {
--			DEBUG(3, ("Reusing homes service for user '%s' using home directory: '%s'\n", 
--				vuser->user.unix_name, vuser->unix_homedir));
--
-+		} else {
-+			DEBUG(3, ("Using static (or previously created) service for user '%s'; path = '%s'\n", 
-+				vuser->user.unix_name, lp_pathname(servicenumber) ));
- 			vuser->homes_snum = servicenumber;
- 		}
--	} else {
--		vuser->homes_snum = -1;
--	}
-+	} 
- 	
- 	if (srv_is_signing_negotiated() && !vuser->guest && !srv_signing_started()) {
- 		/* Try and turn on server signing on the first non-guest sessionsetup. */
-Index: param/loadparm.c
-===================================================================
---- param/loadparm.c	(revision 2069)
-+++ param/loadparm.c	(working copy)
-@@ -2305,6 +2305,10 @@
- 	copy_service(ServicePtrs[i], &tservice, NULL);
- 	if (name)
- 		string_set(&ServicePtrs[i]->szService, name);
-+		
-+	DEBUG(8,("add_a_service: Creating snum = %d for %s\n", 
-+		i, ServicePtrs[i]->szService));
-+		
- 	return (i);
- }
- 
-@@ -2344,7 +2348,7 @@
- 	ServicePtrs[i]->autoloaded = True;
- 
- 	DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n", pszHomename, 
--	       user, newHomedir));
-+	       user, ServicePtrs[i]->szPath ));
- 	
- 	return (True);
- }
diff --git a/net-fs/samba/files/samba-3.0.6-libdirsymlink.patch b/net-fs/samba/files/samba-3.0.6-libdirsymlink.patch
deleted file mode 100644
index ecdc0851e264..000000000000
--- a/net-fs/samba/files/samba-3.0.6-libdirsymlink.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- source/configure.in.old	2004-09-09 11:33:06.218241792 +0200
-+++ source/configure.in	2004-09-09 11:37:09.844205016 +0200
-@@ -1708,8 +1708,8 @@
- dnl succeed when the header is found. To counter this, make sure the 
- dnl library directory is there and check the ABI directory first (which
- dnl should be harmless on other systems.
--    for l in "lib32" "lib" ; do
--        if test -d "$i/$l" ; then
-+    for l in "lib" ; do
-+        if test -d "$i/$l" -o -L "$i/$l" ; then
-                 LDFLAGS="$save_LDFLAGS -L$i/$l"
-                 LIBS=
-                 export LDFLAGS LIBS CPPFLAGS
diff --git a/net-fs/samba/files/samba-3.0.6-winbind_getpwnam_v1.patch b/net-fs/samba/files/samba-3.0.6-winbind_getpwnam_v1.patch
deleted file mode 100644
index 484c9e775d36..000000000000
--- a/net-fs/samba/files/samba-3.0.6-winbind_getpwnam_v1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: libsmb/samlogon_cache.c
-===================================================================
---- libsmb/samlogon_cache.c	(revision 2082)
-+++ libsmb/samlogon_cache.c	(working copy)
-@@ -106,9 +106,10 @@
- 
- /***********************************************************************
-  Store a NET_USER_INFO_3 structure in a tdb for later user 
-+ username should be in UTF-8 format
- ***********************************************************************/
- 
--BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, NET_USER_INFO_3 *user)
-+BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, const char * username, NET_USER_INFO_3 *user)
- {
- 	TDB_DATA 	data;
-         fstring 	keystr;
-@@ -130,6 +131,14 @@
- 	slprintf(keystr, sizeof(keystr), "%s", sid_string_static(&user_sid));
- 
- 	DEBUG(10,("netsamlogon_cache_store: SID [%s]\n", keystr));
-+	
-+	/* only Samba fills in the username, not sure why NT doesn't */
-+	/* so we fill it in since winbindd_getpwnam() makes use of it */
-+	
-+	if ( !user->uni_user_name.buffer ) {
-+		init_unistr2( &user->uni_user_name, username, STR_TERMINATE );
-+		init_uni_hdr( &user->hdr_user_name, &user->uni_user_name );
-+	}
- 		
- 	/* Prepare data */
- 	
-Index: nsswitch/winbindd_pam.c
-===================================================================
---- nsswitch/winbindd_pam.c	(revision 2082)
-+++ nsswitch/winbindd_pam.c	(working copy)
-@@ -283,7 +283,7 @@
- 	}
- 	
- 	if (NT_STATUS_IS_OK(result)) {
--		netsamlogon_cache_store( cli->mem_ctx, &info3 );
-+		netsamlogon_cache_store( cli->mem_ctx, name_user, &info3 );
- 		wcache_invalidate_samlogon(find_domain_from_name(name_domain), &info3);
- 
- 		/* Check if the user is in the right group */
-@@ -538,7 +538,7 @@
- 	}
- 
- 	if (NT_STATUS_IS_OK(result)) {
--		netsamlogon_cache_store( cli->mem_ctx, &info3 );
-+		netsamlogon_cache_store( cli->mem_ctx, name_user, &info3 );
- 		wcache_invalidate_samlogon(find_domain_from_name(name_domain), &info3);
- 		
- 		if (!NT_STATUS_IS_OK(result = check_info3_in_group(mem_ctx, &info3, state->request.data.auth_crap.required_membership_sid))) {
-Index: auth/auth_domain.c
-===================================================================
---- auth/auth_domain.c	(revision 2082)
-+++ auth/auth_domain.c	(working copy)
-@@ -205,7 +205,7 @@
- 	} else {
- 		nt_status = make_server_info_info3(mem_ctx, user_info->internal_username.str, 
- 						   user_info->smb_name.str, domain, server_info, &info3);
--		netsamlogon_cache_store( mem_ctx, &info3 );
-+		netsamlogon_cache_store( mem_ctx, user_info->smb_name.str, &info3 );
- 	}
- 
- #if 0
diff --git a/net-fs/samba/files/samba-3.0.8-lanman.patch b/net-fs/samba/files/samba-3.0.8-lanman.patch
deleted file mode 100644
index 958c25df039f..000000000000
--- a/net-fs/samba/files/samba-3.0.8-lanman.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: smbd/lanman.c
-===================================================================
---- source/smbd/lanman.c	(revision 3681)
-+++ source/smbd/lanman.c	(revision 3862)
-@@ -2267,6 +2267,12 @@
- 		return False;
- 	*rparam_len = 4;
- 	*rparam = REALLOC(*rparam,*rparam_len);
-+
-+	if ( (snum = lp_servicenumber(sharename)) == -1 ) {
-+		DEBUG(0,("api_PrintJobInfo: unable to get service number from sharename [%s]\n",
-+			sharename));
-+		return False;
-+	}
-   
- 	*rdata_len = 0;
diff --git a/net-fs/samba/files/samba-3.0.9-util.c-bitpmap.c-4120.patch b/net-fs/samba/files/samba-3.0.9-util.c-bitpmap.c-4120.patch
deleted file mode 100644
index 41b4189f2042..000000000000
--- a/net-fs/samba/files/samba-3.0.9-util.c-bitpmap.c-4120.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: branches/SAMBA_3_0/source/lib/util.c
-===================================================================
---- branches/SAMBA_3_0/source/lib/util.c	(revision 4119)
-+++ branches/SAMBA_3_0/source/lib/util.c	(revision 4120)
-@@ -867,9 +867,7 @@
- void *malloc_(size_t size)
- {
- #undef malloc
--	/* If we don't add an amount here the glibc memset seems to write
--	   one byte over. */
--	return malloc(size+16);
-+	return malloc(size);
- #define malloc(s) __ERROR_DONT_USE_MALLOC_DIRECTLY
- }
- 
-@@ -880,9 +878,7 @@
- static void *calloc_(size_t count, size_t size)
- {
- #undef calloc
--	/* If we don't add an amount here the glibc memset seems to write
--	   one byte over. */
--	return calloc(count+1, size);
-+	return calloc(count, size);
- #define calloc(n,s) __ERROR_DONT_USE_CALLOC_DIRECTLY
- }
- 
-@@ -893,9 +889,7 @@
- static void *realloc_(void *ptr, size_t size)
- {
- #undef realloc
--	/* If we don't add an amount here the glibc memset seems to write
--	   one byte over. */
--	return realloc(ptr, size+16);
-+	return realloc(ptr, size);
- #define realloc(p,s) __ERROR_DONT_USE_RELLOC_DIRECTLY
- }
- 
-Index: branches/SAMBA_3_0/source/lib/bitmap.c
-===================================================================
---- branches/SAMBA_3_0/source/lib/bitmap.c	(revision 4119)
-+++ branches/SAMBA_3_0/source/lib/bitmap.c	(revision 4120)
-@@ -41,7 +41,7 @@
- 		return NULL;
- 	}
- 
--	memset(bm->b, 0, sizeof(bm->b[0])*(n+31)/32);
-+	memset(bm->b, 0, sizeof(uint32)*((n+31)/32));
- 
- 	return bm;
- }
-@@ -78,7 +78,7 @@
- 		return NULL;
- 	}
- 
--	memset(bm->b, 0, sizeof(bm->b[0])*(n+31)/32);
-+	memset(bm->b, 0, sizeof(uint32)*((n+31)/32));
- 
- 	return bm;
- }
-@@ -92,7 +92,7 @@
-         int count = MIN(dst->n, src->n);
- 
-         SMB_ASSERT(dst->b != src->b);
--	memcpy(dst->b, src->b, sizeof(dst->b[0])*(count+31)/32);
-+	memcpy(dst->b, src->b, sizeof(uint32)*((count+31)/32));
- 
-         return count;
- }
diff --git a/net-fs/samba/files/samba-3.0.x.patch b/net-fs/samba/files/samba-3.0.x.patch
deleted file mode 100644
index 8d67df280e16..000000000000
--- a/net-fs/samba/files/samba-3.0.x.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-##################################################################
-# Recommended patchset for Samba 3.0.4
-#
-# This patchset fixes the following bugs:
-# * BUG 1315 - wbinfo -t unsuccessful on 3.0.4
-# * BUG 1319 - Cannot write to a share with write-list users
-# * BUG 1345 - Macromedia Homesite cannot connect anymore 
-#              after upgrade to 3.0.4
-#
-# Please refer to https://bugzilla.samba.org/ for specific 
-# details regarding the actual bug reports.
-##################################################################
-
-
-Index: source/rpc_client/cli_pipe.c
-===================================================================
---- source/rpc_client/cli_pipe.c	(revision 842)
-+++ source/rpc_client/cli_pipe.c	(working copy)
-@@ -332,13 +332,24 @@
- 	if (cli->pipe_auth_flags & AUTH_PIPE_NETSEC) {
- 		RPC_AUTH_NETSEC_CHK chk;
- 
--		if (auth_len != RPC_AUTH_NETSEC_CHK_LEN) {
-+		if ( (auth_len != RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN) 
-+			&& (auth_len != RPC_AUTH_NETSEC_SIGN_ONLY_CHK_LEN)  ) 
-+		{
- 			DEBUG(0,("rpc_auth_pipe: wrong schannel auth len %d\n", auth_len));
- 			return False;
- 		}
- 
--		if (!smb_io_rpc_auth_netsec_chk("schannel_auth_sign", 
--						&chk, &auth_verf, 0)) {
-+		/* can't seal with no nonce */
-+		if ( (cli->pipe_auth_flags & AUTH_PIPE_SEAL)
-+			&& (auth_len != RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN)  )
-+		{
-+			DEBUG(0,("rpc_auth_pipe: sealing not supported with schannel auth len %d\n", auth_len));
-+			return False;
-+		}
-+		
-+
-+		if (!smb_io_rpc_auth_netsec_chk("schannel_auth_sign", auth_len, &chk, &auth_verf, 0)) 
-+		{
- 			DEBUG(0, ("rpc_auth_pipe: schannel unmarshalling "
- 				  "RPC_AUTH_NETSECK_CHK failed\n"));
- 			return False;
-@@ -918,7 +929,7 @@
- 			auth_len = RPC_AUTH_NTLMSSP_CHK_LEN;
- 		}
- 		if (cli->pipe_auth_flags & AUTH_PIPE_NETSEC) {	
--			auth_len = RPC_AUTH_NETSEC_CHK_LEN;
-+			auth_len = RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN;
- 		}
- 		auth_hdr_len = RPC_HDR_AUTH_LEN;
- 	}
-@@ -1034,8 +1045,9 @@
- 				/* write auth footer onto the packet */
- 				
- 				parse_offset_marker = prs_offset(&sec_blob);
--				if (!smb_io_rpc_auth_netsec_chk("", &verf,
--								&sec_blob, 0)) {
-+				if (!smb_io_rpc_auth_netsec_chk("", RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN, 
-+					&verf, &sec_blob, 0)) 
-+				{
- 					prs_mem_free(&sec_blob);
- 					return False;
- 				}
-Index: source/smbd/filename.c
-===================================================================
---- source/smbd/filename.c	(revision 842)
-+++ source/smbd/filename.c	(working copy)
-@@ -137,6 +137,10 @@
- 	if (!*name) {
- 		name[0] = '.';
- 		name[1] = '\0';
-+		if (SMB_VFS_STAT(conn,name,&st) == 0) {
-+			*pst = st;
-+		}
-+		DEBUG(5,("conversion finished %s -> %s\n",orig_path, name));
- 		return(True);
- 	}
- 
-Index: source/smbd/uid.c
-===================================================================
---- source/smbd/uid.c	(revision 842)
-+++ source/smbd/uid.c	(working copy)
-@@ -189,20 +189,26 @@
- 
- 	snum = SNUM(conn);
- 
-+	if ((vuser) && !check_user_ok(conn, vuser, snum)) {
-+		DEBUG(2,("change_to_user: SMB user %s (unix user %s, vuid %d) not permitted access to share %s.\n",
-+			vuser->user.smb_name, vuser->user.unix_name, vuid, lp_servicename(snum)));
-+		return False;
-+	}
-+
- 	if (conn->force_user) /* security = share sets this too */ {
- 		uid = conn->uid;
- 		gid = conn->gid;
- 		current_user.groups = conn->groups;
- 		current_user.ngroups = conn->ngroups;
- 		token = conn->nt_user_token;
--	} else if ((vuser) && check_user_ok(conn, vuser, snum)) {
-+	} else if (vuser) {
- 		uid = conn->admin_user ? 0 : vuser->uid;
- 		gid = vuser->gid;
- 		current_user.ngroups = vuser->n_groups;
- 		current_user.groups  = vuser->groups;
- 		token = vuser->nt_user_token;
- 	} else {
--		DEBUG(2,("change_to_user: Invalid vuid used %d or vuid not permitted access to share.\n",vuid));
-+		DEBUG(2,("change_to_user: Invalid vuid used %d in accessing share %s.\n",vuid, lp_servicename(snum) ));
- 		return False;
- 	}
- 
-Index: source/rpc_server/srv_pipe.c
-===================================================================
---- source/rpc_server/srv_pipe.c	(revision 842)
-+++ source/rpc_server/srv_pipe.c	(working copy)
-@@ -124,7 +124,7 @@
- 	if(p->ntlmssp_auth_validated) {
- 		data_space_available -= (RPC_HDR_AUTH_LEN + RPC_AUTH_NTLMSSP_CHK_LEN);
- 	} else if(p->netsec_auth_validated) {
--		data_space_available -= (RPC_HDR_AUTH_LEN + RPC_AUTH_NETSEC_CHK_LEN);
-+		data_space_available -= (RPC_HDR_AUTH_LEN + RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN);
- 	}
- 
- 	/*
-@@ -177,8 +177,8 @@
- 	} else if (p->netsec_auth_validated) {
- 		p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN +
- 			data_len + ss_padding_len +
--			RPC_HDR_AUTH_LEN + RPC_AUTH_NETSEC_CHK_LEN;
--		p->hdr.auth_len = RPC_AUTH_NETSEC_CHK_LEN;
-+			RPC_HDR_AUTH_LEN + RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN;
-+		p->hdr.auth_len = RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN;
- 	} else {
- 		p->hdr.frag_len = RPC_HEADER_LEN + RPC_HDR_RESP_LEN + data_len;
- 		p->hdr.auth_len = 0;
-@@ -309,7 +309,8 @@
- 			      SENDER_IS_ACCEPTOR,
- 			      &verf, data, data_len + ss_padding_len);
- 
--		smb_io_rpc_auth_netsec_chk("", &verf, &outgoing_pdu, 0);
-+		smb_io_rpc_auth_netsec_chk("", RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN, 
-+			&verf, &outgoing_pdu, 0);
- 
- 		p->netsec_auth.seq_num++;
- 	}
-@@ -1339,7 +1340,7 @@
- 
- 	auth_len = p->hdr.auth_len;
- 
--	if (auth_len != RPC_AUTH_NETSEC_CHK_LEN) {
-+	if (auth_len != RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN) {
- 		DEBUG(0,("Incorrect auth_len %d.\n", auth_len ));
- 		return False;
- 	}
-@@ -1384,7 +1385,9 @@
- 		return False;
- 	}
- 
--	if(!smb_io_rpc_auth_netsec_chk("", &netsec_chk, rpc_in, 0)) {
-+	if(!smb_io_rpc_auth_netsec_chk("", RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN, 
-+		&netsec_chk, rpc_in, 0)) 
-+	{
- 		DEBUG(0,("failed to unmarshal RPC_AUTH_NETSEC_CHK.\n"));
- 		return False;
- 	}
-Index: source/rpc_parse/parse_rpc.c
-===================================================================
---- source/rpc_parse/parse_rpc.c	(revision 842)
-+++ source/rpc_parse/parse_rpc.c	(working copy)
-@@ -1189,7 +1189,8 @@
- /*******************************************************************
- reads or writes an RPC_AUTH_NETSEC_CHK structure.
- ********************************************************************/
--BOOL smb_io_rpc_auth_netsec_chk(const char *desc, RPC_AUTH_NETSEC_CHK * chk,
-+BOOL smb_io_rpc_auth_netsec_chk(const char *desc, int auth_len, 
-+                                RPC_AUTH_NETSEC_CHK * chk,
- 				prs_struct *ps, int depth)
- {
- 	if (chk == NULL)
-@@ -1198,10 +1199,19 @@
- 	prs_debug(ps, depth, desc, "smb_io_rpc_auth_netsec_chk");
- 	depth++;
- 
--	prs_uint8s(False, "sig  ", ps, depth, chk->sig, sizeof(chk->sig));
--	prs_uint8s(False, "seq_num", ps, depth, chk->seq_num, sizeof(chk->seq_num));
--	prs_uint8s(False, "packet_digest", ps, depth, chk->packet_digest, sizeof(chk->packet_digest));
--	prs_uint8s(False, "confounder", ps, depth, chk->confounder, sizeof(chk->confounder));
-+	if ( !prs_uint8s(False, "sig  ", ps, depth, chk->sig, sizeof(chk->sig)) )
-+		return False;
-+		
-+	if ( !prs_uint8s(False, "seq_num", ps, depth, chk->seq_num, sizeof(chk->seq_num)) )
-+		return False;
-+		
-+	if ( !prs_uint8s(False, "packet_digest", ps, depth, chk->packet_digest, sizeof(chk->packet_digest)) )
-+		return False;
-+	
-+	if ( auth_len == RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN ) {
-+		if ( !prs_uint8s(False, "confounder", ps, depth, chk->confounder, sizeof(chk->confounder)) )
-+			return False;
-+	}
- 
- 	return True;
- }
-Index: source/include/rpc_dce.h
-===================================================================
---- source/include/rpc_dce.h	(revision 842)
-+++ source/include/rpc_dce.h	(working copy)
-@@ -63,8 +63,10 @@
- #define NETSEC_AUTH_TYPE 0x44
- #define NETSEC_SIGN_SIGNATURE { 0x77, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 }
- #define NETSEC_SEAL_SIGNATURE { 0x77, 0x00, 0x7a, 0x00, 0xff, 0xff, 0x00, 0x00 }
--#define RPC_AUTH_NETSEC_CHK_LEN 0x20
- 
-+#define RPC_AUTH_NETSEC_SIGN_OR_SEAL_CHK_LEN 	0x20
-+#define RPC_AUTH_NETSEC_SIGN_ONLY_CHK_LEN 	0x18
-+
- /* The 7 here seems to be required to get Win2k not to downgrade us
-    to NT4.  Actually, anything other than 1ff would seem to do... */
- #define NETLOGON_NEG_AUTH2_FLAGS 0x000701ff
diff --git a/net-fs/samba/files/samba-pdb_ldap-exop.patch b/net-fs/samba/files/samba-pdb_ldap-exop.patch
deleted file mode 100644
index 7d866782d587..000000000000
--- a/net-fs/samba/files/samba-pdb_ldap-exop.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Index: passdb/pdb_ldap.c
-===================================================================
-RCS file: /home/cvs/samba/source/passdb/pdb_ldap.c,v
-retrieving revision 1.28.2.61
-diff -u -r1.28.2.61 pdb_ldap.c
---- passdb/pdb_ldap.c	16 May 2003 14:15:09 -0000	1.28.2.61
-+++ passdb/pdb_ldap.c	27 May 2003 13:27:16 -0000
-@@ -55,6 +55,24 @@
- #define LDAP_OPT_SUCCESS 0
- #endif
- 
-+#if defined(LDAP_EXOP_X_MODIFY_PASSWD) && !defined(LDAP_EXOP_MODIFY_PASSWD)
-+#define LDAP_EXOP_MODIFY_PASSWD LDAP_EXOP_X_MODIFY_PASSWD
-+#elif !defined(LDAP_EXOP_MODIFY_PASSWD)
-+#define "1.3.6.1.4.1.4203.1.11.1"
-+#endif
-+
-+#if defined(LDAP_EXOP_X_MODIFY_PASSWD_ID) && !defined(LDAP_EXOP_MODIFY_PASSWD_ID)
-+#define LDAP_TAG_EXOP_MODIFY_PASSWD_ID LDAP_EXOP_X_MODIFY_PASSWD_ID
-+#elif !defined(LDAP_EXOP_MODIFY_PASSWD_ID)
-+#define LDAP_TAG_EXOP_MODIFY_PASSWD_ID        ((ber_tag_t) 0x80U)
-+#endif
-+
-+#if defined(LDAP_EXOP_X_MODIFY_PASSWD_NEW) && !defined(LDAP_EXOP_MODIFY_PASSWD_NEW)
-+#define LDAP_TAG_EXOP_MODIFY_PASSWD_NEW LDAP_EXOP_X_MODIFY_PASSWD_NEW
-+#elif !defined(LDAP_EXOP_MODIFY_PASSWD_NEW)
-+#define LDAP_TAG_EXOP_MODIFY_PASSWD_NEW       ((ber_tag_t) 0x82U)
-+#endif
-+
- #ifndef SAM_ACCOUNT
- #define SAM_ACCOUNT struct sam_passwd
- #endif
-@@ -910,7 +928,6 @@
- 	return rc;
- }
- 
--#ifdef LDAP_EXOP_X_MODIFY_PASSWD
- static int ldapsam_extended_operation(struct ldapsam_privates *ldap_state, LDAP_CONST char *reqoid, struct berval *reqdata, LDAPControl **serverctrls, LDAPControl **clientctrls, char **retoidp, struct berval **retdatap)
- {
- 	int 		rc = LDAP_SERVER_DOWN;
-@@ -934,7 +951,6 @@
- 		
- 	return rc;
- }
--#endif
- 
- /*******************************************************************
-  run the search by name.
-@@ -2713,7 +2729,6 @@
- 		}  
- 	}
- 	
--#ifdef LDAP_EXOP_X_MODIFY_PASSWD
- 	if (!(pdb_get_acct_ctrl(newpwd)&(ACB_WSTRUST|ACB_SVRTRUST|ACB_DOMTRUST)) &&
- 		(lp_ldap_passwd_sync() != LDAP_PASSWD_SYNC_OFF) &&
- 		need_update(newpwd, PDB_PLAINTEXT_PW) &&
-@@ -2740,8 +2755,8 @@
- 		}
- 
- 		ber_printf (ber, "{");
--		ber_printf (ber, "ts", LDAP_TAG_EXOP_X_MODIFY_PASSWD_ID, utf8_dn);
--	        ber_printf (ber, "ts", LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW, utf8_password);
-+		ber_printf (ber, "ts", LDAP_TAG_EXOP_MODIFY_PASSWD_ID, utf8_dn);
-+	        ber_printf (ber, "ts", LDAP_TAG_EXOP_MODIFY_PASSWD_NEW, utf8_password);
- 	        ber_printf (ber, "N}");
- 
- 	        if ((rc = ber_flatten (ber, &bv))<0) {
-@@ -2756,7 +2771,7 @@
- 		SAFE_FREE(utf8_password);
- 		ber_free(ber, 1);
- 
--		if ((rc = ldapsam_extended_operation(ldap_state, LDAP_EXOP_X_MODIFY_PASSWD,
-+		if ((rc = ldapsam_extended_operation(ldap_state, LDAP_EXOP_MODIFY_PASSWD,
- 						    bv, NULL, NULL, &retoid, &retdata))!=LDAP_SUCCESS) {
- 			DEBUG(0,("LDAP Password could not be changed for user %s: %s\n",
- 				pdb_get_username(newpwd),ldap_err2string(rc)));
-@@ -2770,9 +2785,6 @@
- 		}
- 		ber_bvfree(bv);
- 	}
--#else
--	DEBUG(10,("LDAP PASSWORD SYNC is not supported!\n"));
--#endif /* LDAP_EXOP_X_MODIFY_PASSWD */
- 	return NT_STATUS_OK;
- }
- 
-Index: param/loadparm.c
-===================================================================
-RCS file: /home/cvs/samba/source/param/loadparm.c,v
-retrieving revision 1.397.2.56
-diff -u -r1.397.2.56 loadparm.c
---- param/loadparm.c	14 May 2003 03:32:19 -0000	1.397.2.56
-+++ param/loadparm.c	27 May 2003 13:27:19 -0000
-@@ -625,18 +625,16 @@
- };
- 
- static const struct enum_list enum_ldap_passwd_sync[] = {
--	{LDAP_PASSWD_SYNC_ON, "Yes"},
--	{LDAP_PASSWD_SYNC_ON, "yes"},
--	{LDAP_PASSWD_SYNC_ON, "on"},
--	{LDAP_PASSWD_SYNC_ON, "On"},
- 	{LDAP_PASSWD_SYNC_OFF, "no"},
- 	{LDAP_PASSWD_SYNC_OFF, "No"},
- 	{LDAP_PASSWD_SYNC_OFF, "off"},
- 	{LDAP_PASSWD_SYNC_OFF, "Off"},
--#ifdef LDAP_EXOP_X_MODIFY_PASSWD	
-+	{LDAP_PASSWD_SYNC_ON, "Yes"},
-+	{LDAP_PASSWD_SYNC_ON, "yes"},
-+	{LDAP_PASSWD_SYNC_ON, "on"},
-+	{LDAP_PASSWD_SYNC_ON, "On"},
- 	{LDAP_PASSWD_SYNC_ONLY, "Only"},
- 	{LDAP_PASSWD_SYNC_ONLY, "only"},
--#endif /* LDAP_EXOP_X_MODIFY_PASSWD */	
- 	{-1, NULL}
- };
-