svn commit: samba r17430 - in branches/SAMBA_4_0/source:
lib/ldb/include lib/ldb/tools libcli/ldap
metze at samba.org
metze at samba.org
Sat Aug 5 19:50:59 GMT 2006
Author: metze
Date: 2006-08-05 19:50:58 +0000 (Sat, 05 Aug 2006)
New Revision: 17430
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17430
Log:
implement the LDAP_SERVER_PERMISSIVE_MODIFY control in the client
metze
Modified:
branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-08-05 19:35:00 UTC (rev 17429)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-08-05 19:50:58 UTC (rev 17430)
@@ -523,6 +523,14 @@
#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
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c 2006-08-05 19:35:00 UTC (rev 17429)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c 2006-08-05 19:50:58 UTC (rev 17430)
@@ -555,6 +555,27 @@
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;
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c 2006-08-05 19:35:00 UTC (rev 17429)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_controls.c 2006-08-05 19:50:58 UTC (rev 17430)
@@ -428,6 +428,15 @@
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 @@
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 @@
{ "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 },
More information about the samba-cvs
mailing list