summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-02-05 17:28:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:48 -0500
commitad5e8bbe9d5c2250092bb3a83098c3af46304a82 (patch)
tree5221e33c0fdacd9d74b28893a53bf69d0e0fa337
parent76036d37b42d0c77e57b288af410b931c51fea81 (diff)
downloadsamba-ad5e8bbe9d5c2250092bb3a83098c3af46304a82.tar.gz
samba-ad5e8bbe9d5c2250092bb3a83098c3af46304a82.tar.bz2
samba-ad5e8bbe9d5c2250092bb3a83098c3af46304a82.zip
r13352: Integrate Patch to support the ManageDSAIT control
from Pete Rowley <prowley@redhat.com> (This used to be commit bf20a848fda1607ca1b0d84791c299c0035793a1)
-rw-r--r--source4/libcli/ldap/ldap_controls.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 1f7a415e8e..cb7b52d423 100644
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -345,6 +345,15 @@ static BOOL decode_notification_request(void *mem_ctx, DATA_BLOB in, void **out)
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);
@@ -568,6 +577,16 @@ static BOOL encode_notification_request(void *mem_ctx, void *in, DATA_BLOB *out)
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 },
@@ -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 },
+ { "2.16.840.1.113730.3.4.2", decode_manageDSAIT_request, encode_manageDSAIT_request },
{ NULL, NULL, NULL }
};