r21496: A number of ldb control and LDAP changes, surrounding the

'phantom_root' flag in the search_options control

- Add in support for LDB controls to the js layer
- Test the behaviour
- Implement support for the 'phantom_root' flag in the partitions module
- Make the LDAP server set the 'phantom_root' flag in the search_options control
  - This replaces the global_catalog flag passed down as an opaque pointer
- Rework the string-format control parsing function into
  ldb_parse_control_strings(), returning errors by ldb_errorstring()
  method, rather than with printf to stderr
- Rework some of the ldb_control handling logic

Andrew Bartlett
(This used to be commit 2b3df7f38d7790358dbb4de1b8609bf794a351fb)

1 files changed, 0 insertions, 368 deletions

diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 8eb7a7e952..c0de314ef1 100644
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -235,374 +235,6 @@ failed:
 	return NULL;
 }
 
-struct ldb_control **parse_controls(void *mem_ctx, char **control_strings)
-{
-	int i;
-	struct ldb_control **ctrl;
-
-	if (control_strings == NULL || control_strings[0] == NULL)
-		return NULL;
-
-	for (i = 0; control_strings[i]; i++);
-
-	ctrl = talloc_array(mem_ctx, struct ldb_control *, i + 1);
-
-	for (i = 0; control_strings[i]; i++) {
-		if (strncmp(control_strings[i], "vlv:", 4) == 0) {
-			struct ldb_vlv_req_control *control;
-			const char *p;
-			char attr[1024];
-			char ctxid[1024];
-			int crit, bc, ac, os, cc, ret;
-
-			attr[0] = '\0';
-			ctxid[0] = '\0';
-			p = &(control_strings[i][4]);
-			ret = sscanf(p, "%d:%d:%d:%d:%d:%1023[^$]", &crit, &bc, &ac, &os, &cc, ctxid);
-			if (ret < 5) {
-				ret = sscanf(p, "%d:%d:%d:%1023[^:]:%1023[^$]", &crit, &bc, &ac, attr, ctxid);
-			}
-			       
-			if ((ret < 4) || (crit < 0) || (crit > 1)) {
-				fprintf(stderr, "invalid server_sort control syntax\n");
-				fprintf(stderr, " syntax: crit(b):bc(n):ac(n):<os(n):cc(n)|attr(s)>[:ctxid(o)]\n");
-				fprintf(stderr, "   note: b = boolean, n = number, s = string, o = b64 binary blob\n");
-				return NULL;
-			}
-			if (!(ctrl[i] = talloc(ctrl, struct ldb_control))) {
-				fprintf(stderr, "talloc failed\n");
-				return NULL;
-			}
-			ctrl[i]->oid = LDB_CONTROL_VLV_REQ_OID;
-			ctrl[i]->critical = crit;
-			if (!(control = talloc(ctrl[i],
-					       struct ldb_vlv_req_control))) {
-				fprintf(stderr, "talloc failed\n");
-				return NULL;
-			}
-			control->beforeCount = bc;
-			control->afterCount = ac;
-			if (attr[0]) {
-				control->type = 1;
-				control->match.gtOrEq.value = talloc_strdup(control, attr);
-				control->match.gtOrEq.value_len = strlen(attr);
-			} else {
-				control->type = 0;
-				control->match.byOffset.offset = os;
-				control->match.byOffset.contentCount = cc;
-			}
-			if (ctxid[0]) {
-				control->ctxid_len = ldb_base64_decode(ctxid);
-				control->contextId = (char *)talloc_memdup(control, ctxid, control->ctxid_len);
-			} else {
-				control->ctxid_len = 0;
-				control->contextId = NULL;
-			}
-			ctrl[i]->data = control;
-
-			continue;
-		}
-
-		if (strncmp(control_strings[i], "dirsync:", 8) == 0) {
-			struct ldb_dirsync_control *control;
-			const char *p;
-			char cookie[1024];
-			int crit, flags, max_attrs, ret;
-		       
-			cookie[0] = '\0';
-			p = &(control_strings[i][8]);
-			ret = sscanf(p, "%d:%d:%d:%1023[^$]", &crit, &flags, &max_attrs, cookie);
-
-			if ((ret < 3) || (crit < 0) || (crit > 1) || (flags < 0) || (max_attrs < 0)) {
-				fprintf(stderr, "invalid dirsync control syntax\n");
-				fprintf(stderr, " syntax: crit(b):flags(n):max_attrs(n)[:cookie(o)]\n");
-				fprintf(stderr, "   note: b = boolean, n = number, o = b64 binary blob\n");
-				return NULL;
-			}
-
-			/* w2k3 seems to ignore the parameter,
-			 * but w2k sends a wrong cookie when this value is to small
-			 * this would cause looping forever, while getting
-			 * the same data and same cookie forever
-			 */
-			if (max_attrs == 0) max_attrs = 0x0FFFFFFF;
-
-			ctrl[i] = talloc(ctrl, struct ldb_control);
-			ctrl[i]->oid = LDB_CONTROL_DIRSYNC_OID;
-			ctrl[i]->critical = crit;
-			control = talloc(ctrl[i], struct ldb_dirsync_control);
-			control->flags = flags;
-			control->max_attributes = max_attrs;
-			if (*cookie) {
-				control->cookie_len = ldb_base64_decode(cookie);
-				control->cookie = (char *)talloc_memdup(control, cookie, control->cookie_len);
-			} else {
-				control->cookie = NULL;
-				control->cookie_len = 0;
-			}
-			ctrl[i]->data = control;
-
-			continue;
-		}
-
-		if (strncmp(control_strings[i], "asq:", 4) == 0) {
-			struct ldb_asq_control *control;
-			const char *p;
-			char attr[256];
-			int crit, ret;
-
-			attr[0] = '\0';
-			p = &(control_strings[i][4]);
-			ret = sscanf(p, "%d:%255[^$]", &crit, attr);
-			if ((ret != 2) || (crit < 0) || (crit > 1) || (attr[0] == '\0')) {
-				fprintf(stderr, "invalid asq control syntax\n");
-				fprintf(stderr, " syntax: crit(b):attr(s)\n");
-				fprintf(stderr, "   note: b = boolean, s = string\n");
-				return NULL;
-			}
-
-			ctrl[i] = talloc(ctrl, struct ldb_control);
-			ctrl[i]->oid = LDB_CONTROL_ASQ_OID;
-			ctrl[i]->critical = crit;
-			control = talloc(ctrl[i], struct ldb_asq_control);
-			control->request = 1;
-			control->source_attribute = talloc_strdup(control, attr);
-			control->src_attr_len = strlen(attr);
-			ctrl[i]->data = control;
-
-			continue;
-		}
-
-		if (strncmp(control_strings[i], "extended_dn:", 12) == 0) {
-			struct ldb_extended_dn_control *control;
-			const char *p;
-			int crit, type, ret;
-
-			p = &(control_strings[i][12]);
-			ret = sscanf(p, "%d:%d", &crit, &type);
-			if ((ret != 2) || (crit < 0) || (crit > 1) || (type < 0) || (type > 1)) {
-				fprintf(stderr, "invalid extended_dn control syntax\n");
-				fprintf(stderr, " syntax: crit(b):type(b)\n");
-				fprintf(stderr, "   note: b = boolean\n");
-				return NULL;
-			}
-
-			ctrl[i] = talloc(ctrl, struct ldb_control);
-			ctrl[i]->oid = LDB_CONTROL_EXTENDED_DN_OID;
-			ctrl[i]->critical = crit;
-			control = talloc(ctrl[i], struct ldb_extended_dn_control);
-			control->type = type;
-			ctrl[i]->data = control;
-
-			continue;
-		}
-
-		if (strncmp(control_strings[i], "sd_flags:", 9) == 0) {
-			struct ldb_sd_flags_control *control;
-			const char *p;
-			int crit, ret;
-			unsigned secinfo_flags;
-
-			p = &(control_strings[i][9]);
-			ret = sscanf(p, "%d:%u", &crit, &secinfo_flags);
-			if ((ret != 2) || (crit < 0) || (crit > 1) || (secinfo_flags < 0) || (secinfo_flags > 0xF)) {
-				fprintf(stderr, "invalid sd_flags control syntax\n");
-				fprintf(stderr, " syntax: crit(b):secinfo_flags(n)\n");
-				fprintf(stderr, "   note: b = boolean, n = number\n");
-				return NULL;
-			}
-
-			ctrl[i] = talloc(ctrl, struct ldb_control);
-			ctrl[i]->oid = LDB_CONTROL_SD_FLAGS_OID;
-			ctrl[i]->critical = crit;
-			control = talloc(ctrl[i], struct ldb_sd_flags_control);
-			control->secinfo_flags = secinfo_flags;
-			ctrl[i]->data = control;
-
-			continue;
-		}
-
-		if (strncmp(control_strings[i], "search_options:", 15) == 0) {
-			struct ldb_search_options_control *control;
-			const char *p;
-			int crit, ret;
-			unsigned search_options;
-
-			p = &(control_strings[i][15]);
-			ret = sscanf(p, "%d:%u", &crit, &search_options);
-			if ((ret != 2) || (crit < 0) || (crit > 1) || (search_options < 0) || (search_options > 0xF)) {
-				fprintf(stderr, "invalid search_options control syntax\n");
-				fprintf(stderr, " syntax: crit(b):search_options(n)\n");
-				fprintf(stderr, "   note: b = boolean, n = number\n");
-				return NULL;
-			}
-
-			ctrl[i] = talloc(ctrl, struct ldb_control);
-			ctrl[i]->oid = LDB_CONTROL_SEARCH_OPTIONS_OID;
-			ctrl[i]->critical = crit;
-			control = talloc(ctrl[i], struct ldb_search_options_control);
-			control->search_options = search_options;
-			ctrl[i]->data = control;
-
-			continue;
-		}
-
-		if (strncmp(control_strings[i], "domain_scope:", 13) == 0) {
-			const char *p;
-			int crit, ret;
-
-			p = &(control_strings[i][13]);
-			ret = sscanf(p, "%d", &crit);
-			if ((ret != 1) || (crit < 0) || (crit > 1)) {
-				fprintf(stderr, "invalid domain_scope control syntax\n");
-				fprintf(stderr, " syntax: crit(b)\n");
-				fprintf(stderr, "   note: b = boolean\n");
-				return NULL;
-			}
-
-			ctrl[i] = talloc(ctrl, struct ldb_control);
-			ctrl[i]->oid = LDB_CONTROL_DOMAIN_SCOPE_OID;
-			ctrl[i]->critical = crit;
-			ctrl[i]->data = NULL;
-
-			continue;
-		}
-
-		if (strncmp(control_strings[i], "paged_results:", 14) == 0) {
-			struct ldb_paged_control *control;
-			const char *p;
-			int crit, size, ret;
-		       
-			p = &(control_strings[i][14]);
-			ret = sscanf(p, "%d:%d", &crit, &size);
-
-			if ((ret != 2) || (crit < 0) || (crit > 1) || (size < 0)) {
-				fprintf(stderr, "invalid paged_results control syntax\n");
-				fprintf(stderr, " syntax: crit(b):size(n)\n");
-				fprintf(stderr, "   note: b = boolean, n = number\n");
-				return NULL;
-			}
-
-			ctrl[i] = talloc(ctrl, struct ldb_control);
-			ctrl[i]->oid = LDB_CONTROL_PAGED_RESULTS_OID;
-			ctrl[i]->critical = crit;
-			control = talloc(ctrl[i], struct ldb_paged_control);
-			control->size = size;
-			control->cookie = NULL;
-			control->cookie_len = 0;
-			ctrl[i]->data = control;
-
-			continue;
-		}
-
-		if (strncmp(control_strings[i], "server_sort:", 12) == 0) {
-			struct ldb_server_sort_control **control;
-			const char *p;
-			char attr[256];
-			char rule[128];
-			int crit, rev, ret;
-
-			attr[0] = '\0';
-			rule[0] = '\0';
-			p = &(control_strings[i][12]);
-			ret = sscanf(p, "%d:%d:%255[^:]:%127[^:]", &crit, &rev, attr, rule);
-			if ((ret < 3) || (crit < 0) || (crit > 1) || (rev < 0 ) || (rev > 1) ||attr[0] == '\0') {
-				fprintf(stderr, "invalid server_sort control syntax\n");
-				fprintf(stderr, " syntax: crit(b):rev(b):attr(s)[:rule(s)]\n");
-				fprintf(stderr, "   note: b = boolean, s = string\n");
-				return NULL;
-			}
-			ctrl[i] = talloc(ctrl, struct ldb_control);
-			ctrl[i]->oid = LDB_CONTROL_SERVER_SORT_OID;
-			ctrl[i]->critical = crit;
-			control = talloc_array(ctrl[i], struct ldb_server_sort_control *, 2);
-			control[0] = talloc(control, struct ldb_server_sort_control);
-			control[0]->attributeName = talloc_strdup(control, attr);
-			if (rule[0])
-				control[0]->orderingRule = talloc_strdup(control, rule);
-			else
-				control[0]->orderingRule = NULL;
-			control[0]->reverse = rev;
-			control[1] = NULL;
-			ctrl[i]->data = control;
-
-			continue;
-		}
-
-		if (strncmp(control_strings[i], "notification:", 13) == 0) {
-			const char *p;
-			int crit, ret;
-
-			p = &(control_strings[i][13]);
-			ret = sscanf(p, "%d", &crit);
-			if ((ret != 1) || (crit < 0) || (crit > 1)) {
-				fprintf(stderr, "invalid notification control syntax\n");
-				fprintf(stderr, " syntax: crit(b)\n");
-				fprintf(stderr, "   note: b = boolean\n");
-				return NULL;
-			}
-
-			ctrl[i] = talloc(ctrl, struct ldb_control);
-			ctrl[i]->oid = LDB_CONTROL_NOTIFICATION_OID;
-			ctrl[i]->critical = crit;
-			ctrl[i]->data = NULL;
-
-			continue;
-		}
-
-		if (strncmp(control_strings[i], "show_deleted:", 13) == 0) {
-			const char *p;
-			int crit, ret;
-
-			p = &(control_strings[i][13]);
-			ret = sscanf(p, "%d", &crit);
-			if ((ret != 1) || (crit < 0) || (crit > 1)) {
-				fprintf(stderr, "invalid show_deleted control syntax\n");
-				fprintf(stderr, " syntax: crit(b)\n");
-				fprintf(stderr, "   note: b = boolean\n");
-				return NULL;
-			}
-
-			ctrl[i] = talloc(ctrl, struct ldb_control);
-			ctrl[i]->oid = LDB_CONTROL_SHOW_DELETED_OID;
-			ctrl[i]->critical = crit;
-			ctrl[i]->data = NULL;
-
-			continue;
-		}
-
-		if (strncmp(control_strings[i], "permissive_modify:", 18) == 0) {
-			const char *p;
-			int crit, ret;
-
-			p = &(control_strings[i][18]);
-			ret = sscanf(p, "%d", &crit);
-			if ((ret != 1) || (crit < 0) || (crit > 1)) {
-				fprintf(stderr, "invalid permissive_modify control syntax\n");
-				fprintf(stderr, " syntax: crit(b)\n");
-				fprintf(stderr, "   note: b = boolean\n");
-				return NULL;
-			}
-
-			ctrl[i] = talloc(ctrl, struct ldb_control);
-			ctrl[i]->oid = LDB_CONTROL_PERMISSIVE_MODIFY_OID;
-			ctrl[i]->critical = crit;
-			ctrl[i]->data = NULL;
-
-			continue;
-		}
-
-		/* no controls matched, throw an error */
-		fprintf(stderr, "Invalid control name: '%s'\n", control_strings[i]);
-		return NULL;
-	}
-
-	ctrl[i] = NULL;
-
-	return ctrl;
-}
-
-
 /* this function check controls reply and determines if more
  * processing is needed setting up the request controls correctly
  *