s4-ldb: added support for rodc_control in ldb
authorAndrew Tridgell <tridge@samba.org>
Thu, 19 Aug 2010 21:26:09 +0000 (07:26 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 20 Aug 2010 10:34:11 +0000 (20:34 +1000)
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>

source4/lib/ldb/common/ldb_controls.c

index d75221e72032a8555098366be24f515f23526374..769761dfd4ea001772e041149462b6f492a0ef50 100644 (file)
@@ -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;