diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-08-20 07:26:09 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-08-20 20:34:11 +1000 |
| commit | a662bdc0243743f0e6ff7327cca247f1e3e76e84 (patch) | |
| tree | fd39daf406b5df392298eb04a4ef6fbaf53ee339 | |
| parent | f1c6bab60e52624f5f3188689eb9452a0fdc9221 (diff) | |
| download | samba-a662bdc0243743f0e6ff7327cca247f1e3e76e84.tar.gz samba-a662bdc0243743f0e6ff7327cca247f1e3e76e84.tar.bz2 samba-a662bdc0243743f0e6ff7327cca247f1e3e76e84.zip | |
s4-ldb: added support for rodc_control in ldb
this allows you to specify the RODC join control in python ldb calls
or on the command line
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/lib/ldb/common/ldb_controls.c | 27 |
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 d75221e720..769761dfd4 100644 --- a/source4/lib/ldb/common/ldb_controls.c +++ b/source4/lib/ldb/common/ldb_controls.c @@ -890,6 +890,33 @@ struct ldb_control **ldb_parse_control_strings(struct ldb_context *ldb, TALLOC_C continue; } + if (strncmp(control_strings[i], "rodc_join:", 10) == 0) { + const char *p; + int crit, ret; + + p = &(control_strings[i][10]); + ret = sscanf(p, "%d", &crit); + if ((ret != 1) || (crit < 0) || (crit > 1)) { + error_string = talloc_asprintf(mem_ctx, "invalid rodc_join 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_RODC_DCPROMO_OID; + ctrl[i]->critical = crit; + ctrl[i]->data = NULL; + + continue; + } + /* no controls matched, throw an error */ ldb_asprintf_errstring(ldb, "Invalid control name: '%s'", control_strings[i]); return NULL; |