summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/common
diff options
context:
space:
mode:
authorMatthieu Patou <mat+Informatique.Samba@matws.net>2009-11-27 17:37:14 +0300
committerAndrew Tridgell <tridge@samba.org>2009-11-28 09:56:06 +1100
commitdb41a0afc6412934e166b8a3ed428ce549ba7c66 (patch)
tree2b8888e0c0a627523382a3c7521b81494662c288 /source4/lib/ldb/common
parentf7c28db475261fa859e8f1888a629ced6c447c60 (diff)
downloadsamba-db41a0afc6412934e166b8a3ed428ce549ba7c66.tar.gz
samba-db41a0afc6412934e166b8a3ed428ce549ba7c66.tar.bz2
samba-db41a0afc6412934e166b8a3ed428ce549ba7c66.zip
s4: fix SD update and password change in upgrade script
- reserve a new Samba OID for recalculate SD control - fix the update SD function - fix handling of kvno in the update_machine_account_password function - fix handling of handles in RPC winreg server Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source4/lib/ldb/common')
-rw-r--r--source4/lib/ldb/common/ldb_controls.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/source4/lib/ldb/common/ldb_controls.c b/source4/lib/ldb/common/ldb_controls.c
index 82bd34bda5..f2ab61bde6 100644
--- a/source4/lib/ldb/common/ldb_controls.c
+++ b/source4/lib/ldb/common/ldb_controls.c
@@ -513,6 +513,33 @@ struct ldb_control **ldb_parse_control_strings(struct ldb_context *ldb, void *me
continue;
}
+ if (strncmp(control_strings[i], "recalculate_sd:", 15) == 0) {
+ const char *p;
+ int crit, ret;
+
+ p = &(control_strings[i][15]);
+ ret = sscanf(p, "%d", &crit);
+ if ((ret != 1) || (crit < 0) || (crit > 1)) {
+ error_string = talloc_asprintf(mem_ctx, "invalid recalculate_sd control syntax\n");
+ error_string = talloc_asprintf_append(error_string, " syntax: crit(b)\n");
+ error_string = talloc_asprintf_append(error_string, " note: b = boolean");
+ ldb_set_errstring(ldb, error_string);
+ talloc_free(error_string);
+ return NULL;
+ }
+
+ ctrl[i] = talloc(ctrl, struct ldb_control);
+ if (!ctrl[i]) {
+ ldb_oom(ldb);
+ return NULL;
+ }
+ ctrl[i]->oid = LDB_CONTROL_RECALCULATE_SD_OID;
+ ctrl[i]->critical = crit;
+ ctrl[i]->data = NULL;
+
+ continue;
+ }
+
if (strncmp(control_strings[i], "domain_scope:", 13) == 0) {
const char *p;
int crit, ret;