summaryrefslogtreecommitdiff
path: root/source4/dsdb/common
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-27 12:45:37 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-27 11:29:17 +0200
commit6f718782634add2f8a7eb1b1d416b18ac7b3b260 (patch)
tree30397c5a668bb683dc90183814510abe8073cebb /source4/dsdb/common
parent165521a9b9b931e281ed8ab2929f78c187f15c6b (diff)
downloadsamba-6f718782634add2f8a7eb1b1d416b18ac7b3b260.tar.gz
samba-6f718782634add2f8a7eb1b1d416b18ac7b3b260.tar.bz2
samba-6f718782634add2f8a7eb1b1d416b18ac7b3b260.zip
s4-dsdb when setting DSDB_CONTROL_PASSWORD_BYPASS_LAST_SET_OID make it non-critical
Diffstat (limited to 'source4/dsdb/common')
-rw-r--r--source4/dsdb/common/util.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 6614507c50..e320a41e4b 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -3685,7 +3685,13 @@ int dsdb_request_add_controls(struct ldb_request *req, uint32_t dsdb_flags)
}
if (dsdb_flags & DSDB_PASSWORD_BYPASS_LAST_SET) {
- ret = ldb_request_add_control(req, DSDB_CONTROL_PASSWORD_BYPASS_LAST_SET_OID, true, NULL);
+ /*
+ * This must not be critical, as it will only be
+ * handled (and need to be handled) if the other
+ * attributes in the request bring password_hash into
+ * action
+ */
+ ret = ldb_request_add_control(req, DSDB_CONTROL_PASSWORD_BYPASS_LAST_SET_OID, false, NULL);
if (ret != LDB_SUCCESS) {
return ret;
}