summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-07-22 18:32:49 +0200
committerStefan Metzmacher <metze@samba.org>2008-07-23 14:46:09 +0200
commitb783b28d70d787d7524e8afd54c24ef6f3f8bf54 (patch)
tree98d7b4db385f64890930f32ca3e5f6102730495a /source4
parente0f04e36ad415d7396fea7d43eb1d0db53d53a69 (diff)
downloadsamba-b783b28d70d787d7524e8afd54c24ef6f3f8bf54.tar.gz
samba-b783b28d70d787d7524e8afd54c24ef6f3f8bf54.tar.bz2
samba-b783b28d70d787d7524e8afd54c24ef6f3f8bf54.zip
password_hash: simplify the logic if we have cleartext we always generate the hashes
metze (This used to be commit 5edff84429ef0d03b47a438e18861d26c97e17b6)
Diffstat (limited to 'source4')
-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 5bbae2c164..8dd4e1e76b 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -1071,7 +1071,7 @@ static int setup_password_fields(struct setup_password_fields_io *io)
return LDB_ERR_UNWILLING_TO_PERFORM;
}
- if (io->n.cleartext && !io->n.nt_hash) {
+ if (io->n.cleartext) {
struct samr_Password *hash;
hash = talloc(io->ac, struct samr_Password);
@@ -1092,7 +1092,7 @@ static int setup_password_fields(struct setup_password_fields_io *io)
}
}
- if (io->n.cleartext && !io->n.lm_hash) {
+ if (io->n.cleartext) {
struct samr_Password *hash;
hash = talloc(io->ac, struct samr_Password);