From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 11 May 2010 06:32:40 +0000 (+0200)
Subject: s4:dsdb/password_hash: only try to handle a hash in the unicodePwd field if it's... 
X-Git-Tag: samba-3.6.0pre1~2100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ff38004e8d7bd09e435901c315622e8d6af2403;p=thirdparty%2Fsamba.git

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
---

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 0334c6d95e2..c40656ef422 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