diff options
| author | Gerald Carter <jerry@samba.org> | 2007-03-01 04:58:52 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2007-03-01 04:58:52 +0000 |
| commit | bf114f0480901e40da8525e81d6fa67b290f8f82 (patch) | |
| tree | 7a7cc151512c32a4e0d849c657d8810c12a9ff46 /source | |
| parent | 68fea7c9314f7dad712d0c2229e55101f4985595 (diff) | |
| download | samba-bf114f0480901e40da8525e81d6fa67b290f8f82.tar.gz samba-bf114f0480901e40da8525e81d6fa67b290f8f82.tar.xz samba-bf114f0480901e40da8525e81d6fa67b290f8f82.zip | |
r21622: Fix bad merge caught by James.
Diffstat (limited to 'source')
| -rw-r--r-- | source/nsswitch/winbindd_cred_cache.c | 7 |
1 files changed, 0 insertions, 7 deletions
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; } |