From: Gerald Carter <jerry@samba.org>
Date: Thu, 1 Mar 2007 04:58:52 +0000 (+0000)
Subject: r21622: Fix bad merge caught by James.
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~1030
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05886edb3559355e8cd3e3eb8999f24b64ddb3eb;p=thirdparty%2Fsamba.git

r21622: Fix bad merge caught by James.
---

diff --git a/source/nsswitch/winbindd_cred_cache.c b/source/nsswitch/winbindd_cred_cache.c
index 600409420ae..d0904002dd9 100644
--- a/source/nsswitch/winbindd_cred_cache.c
+++ b/source/nsswitch/winbindd_cred_cache.c
@@ -485,8 +485,6 @@ static NTSTATUS store_memory_creds(struct WINBINDD_MEMORY_CREDS *memcredp, const
 #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 @@ static NTSTATUS store_memory_creds(struct WINBINDD_MEMORY_CREDS *memcredp, const
 	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;
 	}