s4:libcli/ldap Add 'relax' OID to known network representations

[samba.git] / source4 / libcli / ldap / ldap_controls.c

diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 7949758a80c48200246c70d108cca0616b10eb3e..1572f252d5698d05878000dac375f0c26af25e14 100644 (file)
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -126,9 +126,9 @@ static bool decode_server_sort_request(void *mem_ctx, DATA_BLOB in, void *_out)
                        }
                }
 
-               if (asn1_peek_tag(data, ASN1_BOOLEAN)) {
+               if (asn1_peek_tag(data, ASN1_CONTEXT_SIMPLE(1))) {
                        bool reverse;
-                       if (!asn1_read_BOOLEAN(data, &reverse)) {
+                       if (!asn1_read_BOOLEAN_context(data, &reverse, 1)) {
                        return false;
                        }
                        lssc[num]->reverse = reverse;
@@ -214,7 +214,7 @@ static bool decode_sd_flags_request(void *mem_ctx, DATA_BLOB in, void *_out)
                return false;
        }
 
-       if (!asn1_read_Integer(data, &(lsdfc->secinfo_flags))) {
+       if (!asn1_read_Integer(data, (int *) &(lsdfc->secinfo_flags))) {
                return false;
        }
 
@@ -248,7 +248,7 @@ static bool decode_search_options_request(void *mem_ctx, DATA_BLOB in, void *_ou
                return false;
        }
 
-       if (!asn1_read_Integer(data, &(lsoc->search_options))) {
+       if (!asn1_read_Integer(data, (int *) &(lsoc->search_options))) {
                return false;
        }
 
@@ -454,6 +454,24 @@ static bool decode_show_deleted_request(void *mem_ctx, DATA_BLOB in, void *_out)
        return true;
 }
 
+static bool decode_show_recycled_request(void *mem_ctx, DATA_BLOB in, void *_out)
+{
+       if (in.length != 0) {
+               return false;
+       }
+
+       return true;
+}
+
+static bool decode_show_deactivated_link_request(void *mem_ctx, DATA_BLOB in, void *_out)
+{
+       if (in.length != 0) {
+               return false;
+       }
+
+       return true;
+}
+
 static bool decode_permissive_modify_request(void *mem_ctx, DATA_BLOB in, void *_out)
 {
        if (in.length != 0) {
@@ -688,6 +706,13 @@ static bool encode_server_sort_request(void *mem_ctx, void *in, DATA_BLOB *out)
                return false;
        }
 
+       /*
+         RFC2891 section 1.1:
+           SortKeyList ::= SEQUENCE OF SEQUENCE {
+             attributeType   AttributeDescription,
+             orderingRule    [0] MatchingRuleId OPTIONAL,
+             reverseOrder    [1] BOOLEAN DEFAULT FALSE }
+       */
        for (num = 0; lssc[num]; num++) {
                if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                        return false;
@@ -704,7 +729,7 @@ static bool encode_server_sort_request(void *mem_ctx, void *in, DATA_BLOB *out)
                }
 
                if (lssc[num]->reverse) {
-                       if (!asn1_write_BOOLEAN(data, lssc[num]->reverse)) {
+                       if (!asn1_write_BOOLEAN_context(data, lssc[num]->reverse, 1)) {
                                return false;
                        }
                }
@@ -954,6 +979,26 @@ static bool encode_show_deleted_request(void *mem_ctx, void *in, DATA_BLOB *out)
        return true;
 }
 
+static bool encode_show_recycled_request(void *mem_ctx, void *in, DATA_BLOB *out)
+{
+       if (in) {
+               return false;
+       }
+
+       *out = data_blob(NULL, 0);
+       return true;
+}
+
+static bool encode_show_deactivated_link_request(void *mem_ctx, void *in, DATA_BLOB *out)
+{
+       if (in) {
+               return false;
+       }
+
+       *out = data_blob(NULL, 0);
+       return true;
+}
+
 static bool encode_permissive_modify_request(void *mem_ctx, void *in, DATA_BLOB *out)
 {
        if (in) {
@@ -1215,6 +1260,8 @@ static const struct ldap_control_handler ldap_known_controls[] = {
        { "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.2064", decode_show_recycled_request, encode_show_recycled_request },
+       { "1.2.840.113556.1.4.2065", decode_show_deactivated_link_request, encode_show_deactivated_link_request },
        { "1.2.840.113556.1.4.1413", decode_permissive_modify_request, encode_permissive_modify_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 },
@@ -1227,6 +1274,8 @@ static const struct ldap_control_handler ldap_known_controls[] = {
 /* DSDB_EXTENDED_REPLICATED_OBJECTS_OID is internal only, and has no network representation */
        { "1.3.6.1.4.1.7165.4.4.1", NULL, NULL },
        { DSDB_OPENLDAP_DEREFERENCE_CONTROL, decode_openldap_dereference, encode_openldap_dereference},
+/* LDB_CONTROL_RELAX_OID has no data (so no need for pull/push functions) */
+       { LDB_CONTROL_RELAX_OID, NULL, NULL },
        { NULL, NULL, NULL }
 };