diff options
| author | Gerald Carter <jerry@samba.org> | 2007-03-01 04:58:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:18 -0500 |
| commit | 9b568ecdc42226e148089c35899f7b0c5dc834f0 (patch) | |
| tree | 4c653e49f907bffe6b39a299b8cb1dedd382ee79 /source3 | |
| parent | b1f4259cd5ecebfe7e4c4eb73aa32e1ed9b366b8 (diff) | |
| download | samba-9b568ecdc42226e148089c35899f7b0c5dc834f0.tar.gz samba-9b568ecdc42226e148089c35899f7b0c5dc834f0.tar.bz2 samba-9b568ecdc42226e148089c35899f7b0c5dc834f0.zip | |
r21622: Fix bad merge caught by James.
(This used to be commit 05886edb3559355e8cd3e3eb8999f24b64ddb3eb)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/nsswitch/winbindd_cred_cache.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/nsswitch/winbindd_cred_cache.c index 600409420a..d0904002dd 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; } |