r17429: implement the LDAP_SERVER_SHOW_DELETED control in the client

metze

diff --git a/source/lib/ldb/include/ldb.h b/source/lib/ldb/include/ldb.h
index 13ad473b0ba1a7aae2be61501a6f59fcb85eb7b7..05cc1e349498d88387b478cbd63b815d06304a69 100644 (file)
--- a/source/lib/ldb/include/ldb.h
+++ b/source/lib/ldb/include/ldb.h
@@ -450,6 +450,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
 

diff --git a/source/lib/ldb/tools/cmdline.c b/source/lib/ldb/tools/cmdline.c
index c470c64703530cd5594b898abd7a95403c9b6815..5359cb1fffa49e3a080b908501f178ccdbc3c66f 100644 (file)
--- a/source/lib/ldb/tools/cmdline.c
+++ b/source/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;

diff --git a/source/libcli/ldap/ldap_controls.c b/source/libcli/ldap/ldap_controls.c
index 395c4eb836a8a4fed383f96f4112d6b4ca3a9d0f..75af597c33068453b1fbee9377fe071af59ddd3f 100644 (file)
--- a/source/libcli/ldap/ldap_controls.c
+++ b/source/libcli/ldap/ldap_controls.c
@@ -419,6 +419,15 @@ static BOOL decode_notification_request(void *mem_ctx, DATA_BLOB in, void **out)
        return True;
 }
 
+static BOOL decode_show_deleted_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) {
@@ -879,6 +888,16 @@ static BOOL encode_notification_request(void *mem_ctx, void *in, DATA_BLOB *out)
        return True;
 }
 
+static BOOL encode_show_deleted_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) {
@@ -1013,6 +1032,7 @@ struct control_handler ldap_known_controls[] = {
        { "1.2.840.113556.1.4.1504", decode_asq_control, encode_asq_control },
        { "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.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 },