diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-08-05 19:50:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:15:24 -0500 |
| commit | 3a083f8f53b998b6aabf69e845fd0fbdf86b6499 (patch) | |
| tree | 2e5cd598866d1707c9858fe6cf43fb6a70a4bc3d /source4/lib | |
| parent | 12050962f6dd37819e58e1e0b572c159f0406f7a (diff) | |
| download | samba-3a083f8f53b998b6aabf69e845fd0fbdf86b6499.tar.gz samba-3a083f8f53b998b6aabf69e845fd0fbdf86b6499.tar.bz2 samba-3a083f8f53b998b6aabf69e845fd0fbdf86b6499.zip | |
r17430: implement the LDAP_SERVER_PERMISSIVE_MODIFY control in the client
metze
(This used to be commit 96259f0f24b114e505241c9d2deb702a8b40f1b6)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb/include/ldb.h | 8 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/cmdline.c | 21 |
2 files changed, 29 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; |