diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-12-24 13:58:12 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2015-01-05 16:51:30 +0100 |
| commit | c5948040805f2585dd9da3a6955f605d8d9fa70c (patch) | |
| tree | 96cbbb03d48d8c0e188f706a2f98ff38fe853334 /source3/passdb | |
| parent | eda9742e3f10e2a296b00f42cf5b00d06e464d22 (diff) | |
| download | samba-c5948040805f2585dd9da3a6955f605d8d9fa70c.tar.gz | |
s3:passdb: fix logic in pdb_set_pw_history()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10940
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Mon Jan 5 16:51:30 CET 2015 on sn-devel-104
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/pdb_get_set.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/passdb/pdb_get_set.c b/source3/passdb/pdb_get_set.c index 1b716f4728f..5e162db725d 100644 --- a/source3/passdb/pdb_get_set.c +++ b/source3/passdb/pdb_get_set.c @@ -872,19 +872,20 @@ bool pdb_set_lanman_passwd(struct samu *sampass, const uint8 pwd[LM_HASH_LEN], e bool pdb_set_pw_history(struct samu *sampass, const uint8 *pwd, uint32_t historyLen, enum pdb_value_state flag) { + DATA_BLOB new_nt_pw_his = {}; + if (historyLen && pwd){ - DATA_BLOB *old_nt_pw_his = &(sampass->nt_pw_his); - sampass->nt_pw_his = data_blob_talloc(sampass, - pwd, historyLen*PW_HISTORY_ENTRY_LEN); - data_blob_free(old_nt_pw_his); - if (!sampass->nt_pw_his.length) { + new_nt_pw_his = data_blob_talloc(sampass, + pwd, historyLen*PW_HISTORY_ENTRY_LEN); + if (new_nt_pw_his.length == 0) { DEBUG(0, ("pdb_set_pw_history: data_blob_talloc() failed!\n")); return False; } - } else { - sampass->nt_pw_his = data_blob_talloc(sampass, NULL, 0); } + data_blob_free(&sampass->nt_pw_his); + sampass->nt_pw_his = new_nt_pw_his; + return pdb_set_init_flags(sampass, PDB_PWHISTORY, flag); } |