diff options
author | Stefan Metzmacher <metze@samba.org> | 2006-08-05 19:35:00 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:15:24 -0500 |
commit | 12050962f6dd37819e58e1e0b572c159f0406f7a (patch) | |
tree | 6ae27fc80cfbdf9b5ca87f16c7be7e954715139a /source4/lib/ldb | |
parent | 8ac0237eba1831c8ba6d01c2b9d8402636a21bb2 (diff) | |
download | samba-12050962f6dd37819e58e1e0b572c159f0406f7a.tar.gz samba-12050962f6dd37819e58e1e0b572c159f0406f7a.tar.bz2 samba-12050962f6dd37819e58e1e0b572c159f0406f7a.zip |
r17429: implement the LDAP_SERVER_SHOW_DELETED control in the client
metze
(This used to be commit 40dc7c1787c16bfc15ac87fee81d2d2d1f3d2fde)
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r-- | source4/lib/ldb/include/ldb.h | 7 | ||||
-rw-r--r-- | source4/lib/ldb/tools/cmdline.c | 21 |
2 files changed, 28 insertions, 0 deletions
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h index 13ad473b0b..05cc1e3494 100644 --- a/source4/lib/ldb/include/ldb.h +++ b/source4/lib/ldb/include/ldb.h @@ -451,6 +451,13 @@ typedef int (*ldb_qsort_cmp_fn_t) (void *v1, void *v2, void *opaque); #define LDB_CONTROL_NOTIFICATION_OID "1.2.840.113556.1.4.528" /** + OID for getting deleted objects + + \sa <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ldap/ldap/ldap_server_show_deleted_oid.asp">Microsoft documentation of this OID</a> +*/ +#define LDB_CONTROL_SHOW_DELETED_OID "1.2.840.113556.1.4.417" + +/** OID for extended DN \sa <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ldap/ldap/ldap_server_extended_dn_oid.asp">Microsoft documentation of this OID</a> diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c index c470c64703..5359cb1fff 100644 --- a/source4/lib/ldb/tools/cmdline.c +++ b/source4/lib/ldb/tools/cmdline.c @@ -534,6 +534,27 @@ struct ldb_control **parse_controls(void *mem_ctx, char **control_strings) 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; + } + /* no controls matched, throw an error */ fprintf(stderr, "Invalid control name: '%s'\n", control_strings[i]); return NULL; |