s4-dsdb ensure we honour the hash_values control, even for really odd hashes

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 470a2b05a34d098ce3ca3c9ef687785ace80f0d2..02e68cd9190254d7f5731b5e2ba6dd620403af4b 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -2195,7 +2195,8 @@ static int setup_io(struct ph_context *ac,
        }
 
        /* Checks and converts the actual "unicodePwd" attribute */
-       if (quoted_utf16 &&
+       if (!ac->hash_values &&
+           quoted_utf16 &&
            quoted_utf16->length >= 4 &&
            quoted_utf16->data[0] == '"' &&
            quoted_utf16->data[1] == 0 &&
@@ -2251,7 +2252,8 @@ static int setup_io(struct ph_context *ac,
        }
 
        /* Checks and converts the previous "unicodePwd" attribute */
-       if (old_quoted_utf16 &&
+       if (!ac->hash_values &&
+           old_quoted_utf16 &&
            old_quoted_utf16->length >= 4 &&
            old_quoted_utf16->data[0] == '"' &&
            old_quoted_utf16->data[1] == 0 &&