From 011d849a96e77a19150708b42acadabdeb3e52c9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 11 Feb 2016 08:59:09 +0100 Subject: [PATCH] s3:pdb_samba_dsdb: fix calucating of dsdb_flags BUG: https://bugzilla.samba.org/show_bug.cgi?id=9654 Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- source3/passdb/pdb_samba_dsdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source3/passdb/pdb_samba_dsdb.c b/source3/passdb/pdb_samba_dsdb.c index 56f3f107cef..19c6705dfcb 100644 --- a/source3/passdb/pdb_samba_dsdb.c +++ b/source3/passdb/pdb_samba_dsdb.c @@ -366,7 +366,7 @@ static int pdb_samba_dsdb_replace_by_sam(struct pdb_samba_dsdb_state *state, /* If we set a plaintext password, the system will * force the pwdLastSet to now() */ if (need_update(sam, PDB_PASSLASTSET)) { - dsdb_flags = DSDB_PASSWORD_BYPASS_LAST_SET; + dsdb_flags |= DSDB_PASSWORD_BYPASS_LAST_SET; ret |= pdb_samba_dsdb_add_time(msg, "pwdLastSet", pdb_get_pass_last_set_time(sam)); @@ -473,7 +473,7 @@ static int pdb_samba_dsdb_replace_by_sam(struct pdb_samba_dsdb_state *state, } if (changed_lm_pw || changed_nt_pw || changed_history) { /* These attributes can only be modified directly by using a special control */ - dsdb_flags = DSDB_BYPASS_PASSWORD_HASH; + dsdb_flags |= DSDB_BYPASS_PASSWORD_HASH; } } -- 2.47.3