r17430: implement the LDAP_SERVER_PERMISSIVE_MODIFY control in the client

metze
(This used to be commit 96259f0f24b114e505241c9d2deb702a8b40f1b6)

3 files changed, 49 insertions, 0 deletions

diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 05cc1e3494..5a49ae357f 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -523,6 +523,14 @@ typedef int (*ldb_qsort_cmp_fn_t) (void *v1, void *v2, void *opaque);
 #define LDB_CONTROL_VLV_RESP_OID	"2.16.840.1.113730.3.4.10"
 
 /**
+   OID to let modifies don't give an error when adding an existing
+   attribute with the same value or deleting an nonexisting one attribute
+
+   \sa <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ldap/ldap/ldap_server_permissive_modify_oid.asp">Microsoft documentation of this OID</a>
+*/
+#define LDB_CONTROL_PERMISSIVE_MODIFY_OID	"1.2.840.113556.1.4.1413"
+
+/**
    OID for LDAP Extended Operation START_TLS.
 
    This Extended operation is used to start a new TLS
diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 5359cb1fff..f71b6eea69 100644
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -555,6 +555,27 @@ struct ldb_control **parse_controls(void *mem_ctx, char **control_strings)
 			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;
diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 75af597c33..5cd0451136 100644
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -428,6 +428,15 @@ static BOOL decode_show_deleted_request(void *mem_ctx, DATA_BLOB in, void **out)
 	return True;
 }
 
+static BOOL decode_permissive_modify_request(void *mem_ctx, DATA_BLOB in, void **out)
+{
+	if (in.length != 0) {
+		return False;
+	}
+
+	return True;
+}
+
 static BOOL decode_manageDSAIT_request(void *mem_ctx, DATA_BLOB in, void **out)
 {
 	if (in.length != 0) {
@@ -898,6 +907,16 @@ static BOOL encode_show_deleted_request(void *mem_ctx, void *in, DATA_BLOB *out)
 	return True;
 }
 
+static BOOL encode_permissive_modify_request(void *mem_ctx, void *in, DATA_BLOB *out)
+{
+	if (in) {
+		return False;
+	}
+
+	*out = data_blob(NULL, 0);
+	return True;
+}
+
 static BOOL encode_manageDSAIT_request(void *mem_ctx, void *in, DATA_BLOB *out)
 {
 	if (in) {
@@ -1033,6 +1052,7 @@ struct control_handler ldap_known_controls[] = {
 	{ "1.2.840.113556.1.4.841", decode_dirsync_request, encode_dirsync_request },
 	{ "1.2.840.113556.1.4.528", decode_notification_request, encode_notification_request },
 	{ "1.2.840.113556.1.4.417", decode_show_deleted_request, encode_show_deleted_request },
+	{ "1.2.840.113556.1.4.1413", decode_permissive_modify_request, encode_permissive_modify_request },
 	{ "1.2.840.113556.1.4.801", decode_sd_flags_request, encode_sd_flags_request },
 	{ "1.2.840.113556.1.4.1339", decode_domain_scope_request, encode_domain_scope_request },
 	{ "1.2.840.113556.1.4.1340", decode_search_options_request, encode_search_options_request },