r13352: Integrate Patch to support the ManageDSAIT control

from Pete Rowley <prowley@redhat.com>

diff --git a/source/libcli/ldap/ldap_controls.c b/source/libcli/ldap/ldap_controls.c
index 1f7a415e8e73dc817542db021be9080e2f19ae01..cb7b52d42360f59e6ba35e41cd3a8b7eaf26be44 100644 (file)
--- a/source/libcli/ldap/ldap_controls.c
+++ b/source/libcli/ldap/ldap_controls.c
@@ -345,6 +345,15 @@ static BOOL decode_notification_request(void *mem_ctx, DATA_BLOB in, void **out)
        return True;
 }
 
        return True;
 }
 

+static BOOL decode_manageDSAIT_request(void *mem_ctx, DATA_BLOB in, void **out)
+{
+       if (in.length != 0) {
+               return False;
+       }
+
+       return True;
+}
+

 static BOOL encode_server_sort_response(void *mem_ctx, void *in, DATA_BLOB *out)
 {
        struct ldb_sort_resp_control *lsrc = talloc_get_type(in, struct ldb_sort_resp_control);
 static BOOL encode_server_sort_response(void *mem_ctx, void *in, DATA_BLOB *out)
 {
        struct ldb_sort_resp_control *lsrc = talloc_get_type(in, struct ldb_sort_resp_control);


@@ -568,6 +577,16 @@ static BOOL encode_notification_request(void *mem_ctx, void *in, DATA_BLOB *out)
        return True;
 }
 
        return True;
 }
 

+static BOOL encode_manageDSAIT_request(void *mem_ctx, void *in, DATA_BLOB *out)
+{
+       if (in) {
+               return False;
+       }
+
+       *out = data_blob(NULL, 0);
+       return True;
+}
+

 struct control_handler ldap_known_controls[] = {
        { "1.2.840.113556.1.4.319", decode_paged_results_request, encode_paged_results_request },
        { "1.2.840.113556.1.4.529", decode_extended_dn_request, encode_extended_dn_request },
 struct control_handler ldap_known_controls[] = {
        { "1.2.840.113556.1.4.319", decode_paged_results_request, encode_paged_results_request },
        { "1.2.840.113556.1.4.529", decode_extended_dn_request, encode_extended_dn_request },


@@ -576,6 +595,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.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 },

+       { "2.16.840.1.113730.3.4.2", decode_manageDSAIT_request, encode_manageDSAIT_request },

        { NULL, NULL, NULL }
 };
 
        { NULL, NULL, NULL }
 };