svn commit: samba r21622 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch SAMBA_3_0_RELEASE/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2007-03-01 04:58:52 +0000 (Thu, 01 Mar 2007)
New Revision: 21622

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21622

Log:
Fix bad merge caught by James.



Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c
   branches/SAMBA_3_0_25/source/nsswitch/winbindd_cred_cache.c
   branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cred_cache.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c	2007-03-01 04:50:10 UTC (rev 21621)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c	2007-03-01 04:58:52 UTC (rev 21622)
@@ -485,8 +485,6 @@
 #if !defined(HAVE_MLOCK)
 	return NT_STATUS_OK;
 #else
-	int psize = getpagesize();
-
 	/* new_entry->nt_hash is the base pointer for the block
 	   of memory pointed into by new_entry->lm_hash and
 	   new_entry->pass (if we're storing plaintext). */
@@ -506,11 +504,6 @@
 	memcredp->nt_hash = SMB_MEMALIGN_ARRAY(unsigned char, 
 					       getpagesize(), memcredp->len);
 #endif
-
-	/* On non-linux platforms, mlock()'d memory must be aligned */
-
-	memcredp->nt_hash = SMB_MEMALIGN_ARRAY(unsigned char, psize, 
-					       memcredp->len);
 	if (!memcredp->nt_hash) {
 		return NT_STATUS_NO_MEMORY;
 	}

Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_cred_cache.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_cred_cache.c	2007-03-01 04:50:10 UTC (rev 21621)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_cred_cache.c	2007-03-01 04:58:52 UTC (rev 21622)
@@ -485,8 +485,6 @@
 #if !defined(HAVE_MLOCK)
 	return NT_STATUS_OK;
 #else
-	int psize = getpagesize();
-
 	/* new_entry->nt_hash is the base pointer for the block
 	   of memory pointed into by new_entry->lm_hash and
 	   new_entry->pass (if we're storing plaintext). */
@@ -506,11 +504,6 @@
 	memcredp->nt_hash = SMB_MEMALIGN_ARRAY(unsigned char, 
 					       getpagesize(), memcredp->len);
 #endif
-
-	/* On non-linux platforms, mlock()'d memory must be aligned */
-
-	memcredp->nt_hash = SMB_MEMALIGN_ARRAY(unsigned char, psize, 
-					       memcredp->len);
 	if (!memcredp->nt_hash) {
 		return NT_STATUS_NO_MEMORY;
 	}

Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cred_cache.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cred_cache.c	2007-03-01 04:50:10 UTC (rev 21621)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_cred_cache.c	2007-03-01 04:58:52 UTC (rev 21622)
@@ -485,8 +485,6 @@
 #if !defined(HAVE_MLOCK)
 	return NT_STATUS_OK;
 #else
-	int psize = getpagesize();
-
 	/* new_entry->nt_hash is the base pointer for the block
 	   of memory pointed into by new_entry->lm_hash and
 	   new_entry->pass (if we're storing plaintext). */
@@ -506,11 +504,6 @@
 	memcredp->nt_hash = SMB_MEMALIGN_ARRAY(unsigned char, 
 					       getpagesize(), memcredp->len);
 #endif
-
-	/* On non-linux platforms, mlock()'d memory must be aligned */
-
-	memcredp->nt_hash = SMB_MEMALIGN_ARRAY(unsigned char, psize, 
-					       memcredp->len);
 	if (!memcredp->nt_hash) {
 		return NT_STATUS_NO_MEMORY;
 	}