summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-05-11 08:32:40 +0200
committerStefan Metzmacher <metze@samba.org>2010-05-11 08:37:03 +0200
commit8ff38004e8d7bd09e435901c315622e8d6af2403 (patch)
tree37021a7b8b941c2e4ea9b37461417df4e8bc2365 /source4/dsdb/samdb
parentb8c414b35f1bd37a70af7746ee5cc9427e4e31ee (diff)
downloadsamba-8ff38004e8d7bd09e435901c315622e8d6af2403.tar.gz
samba-8ff38004e8d7bd09e435901c315622e8d6af2403.tar.bz2
samba-8ff38004e8d7bd09e435901c315622e8d6af2403.zip
s4:dsdb/password_hash: only try to handle a hash in the unicodePwd field if it's given
Sorry, I removed this logic while cleaning up indentation levels... metze
Diffstat (limited to 'source4/dsdb/samdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/password_hash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 0334c6d95e..c40656ef42 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -1762,7 +1762,7 @@ static int setup_io(struct ph_context *ac,
io->n.cleartext_utf16 = quoted_utf16_2;
io->n.nt_hash = NULL;
- } else {
+ } else if (quoted_utf16) {
/* We have only the hash available -> so no plaintext here */
if (!ac->hash_values) {
/* refuse the change if someone wants to change
@@ -1821,7 +1821,7 @@ static int setup_io(struct ph_context *ac,
io->og.cleartext_utf16 = old_quoted_utf16_2;
io->og.nt_hash = NULL;
- } else {
+ } else if (old_quoted_utf16) {
/* We have only the hash available -> so no plaintext here */
if (!ac->hash_values) {
/* refuse the change if someone wants to change