From 9b568ecdc42226e148089c35899f7b0c5dc834f0 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 1 Mar 2007 04:58:52 +0000 Subject: r21622: Fix bad merge caught by James. (This used to be commit 05886edb3559355e8cd3e3eb8999f24b64ddb3eb) --- source3/nsswitch/winbindd_cred_cache.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'source3/nsswitch') diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/nsswitch/winbindd_cred_cache.c index 600409420ae..d0904002dd9 100644 --- a/source3/nsswitch/winbindd_cred_cache.c +++ b/source3/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; } -- cgit