git.samba.org / kai / samba-autobuild / .git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
r23792: convert Samba4 to GPLv3
[kai/samba-autobuild/.git] / source4 / libcli / ldap / ldap_controls.c
diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 4c5d214a8fa2020d4f18612d20ba11a4e6e783af..4f76c7315b24f995e16230bd81c3a366eb3db444 100644 (file)
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -6,7 +6,7 @@
     
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    
 */
 
@@ -34,10 +33,12 @@ struct control_handler {
 static BOOL decode_server_sort_response(void *mem_ctx, DATA_BLOB in, void **out)
 {
        DATA_BLOB attr;
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
        struct ldb_sort_resp_control *lsrc;
 
-       if (!asn1_load(&data, in)) {
+       if (!data) return False;
+
+       if (!asn1_load(data, in)) {
                return False;
        }
 
@@ -46,17 +47,17 @@ static BOOL decode_server_sort_response(void *mem_ctx, DATA_BLOB in, void **out)
                return False;
        }
 
-       if (!asn1_start_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_read_enumerated(&data, &(lsrc->result))) {
+       if (!asn1_read_enumerated(data, &(lsrc->result))) {
                return False;
        }
 
        lsrc->attr_desc = NULL;
-       if (asn1_peek_tag(&data, ASN1_OCTET_STRING)) {
-               if (!asn1_read_OctetString(&data, &attr)) {
+       if (asn1_peek_tag(data, ASN1_OCTET_STRING)) {
+               if (!asn1_read_OctetString(data, mem_ctx, &attr)) {
                        return False;
                }
                lsrc->attr_desc = talloc_strndup(lsrc, (const char *)attr.data, attr.length);
@@ -65,7 +66,7 @@ static BOOL decode_server_sort_response(void *mem_ctx, DATA_BLOB in, void **out)
                }
        }
 
-       if (!asn1_end_tag(&data)) {
+       if (!asn1_end_tag(data)) {
                return False;
        }
 
@@ -78,21 +79,23 @@ static BOOL decode_server_sort_request(void *mem_ctx, DATA_BLOB in, void **out)
 {
        DATA_BLOB attr;
        DATA_BLOB rule;
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
        struct ldb_server_sort_control **lssc;
        int num;
 
-       if (!asn1_load(&data, in)) {
+       if (!data) return False;
+
+       if (!asn1_load(data, in)) {
                return False;
        }
 
-       if (!asn1_start_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
        lssc = NULL;
 
-       for (num = 0; asn1_peek_tag(&data, ASN1_SEQUENCE(0)); num++) {
+       for (num = 0; asn1_peek_tag(data, ASN1_SEQUENCE(0)); num++) {
                lssc = talloc_realloc(mem_ctx, lssc, struct ldb_server_sort_control *, num + 2);
                if (!lssc) {
                        return False;
@@ -102,11 +105,11 @@ static BOOL decode_server_sort_request(void *mem_ctx, DATA_BLOB in, void **out)
                        return False;
                }
 
-               if (!asn1_start_tag(&data, ASN1_SEQUENCE(0))) {
+               if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                        return False;
                }
 
-               if (!asn1_read_OctetString(&data, &attr)) {
+               if (!asn1_read_OctetString(data, mem_ctx, &attr)) {
                        return False;
                }
 
@@ -115,8 +118,8 @@ static BOOL decode_server_sort_request(void *mem_ctx, DATA_BLOB in, void **out)
                        return False;
                }
        
-               if (asn1_peek_tag(&data, ASN1_OCTET_STRING)) {
-                       if (!asn1_read_OctetString(&data, &rule)) {
+               if (asn1_peek_tag(data, ASN1_OCTET_STRING)) {
+                       if (!asn1_read_OctetString(data, mem_ctx, &rule)) {
                                return False;
                        }
                        lssc[num]->orderingRule = talloc_strndup(lssc[num], (const char *)rule.data, rule.length);
@@ -125,15 +128,15 @@ 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_BOOLEAN)) {
                        BOOL reverse;
-                       if (!asn1_read_BOOLEAN(&data, &reverse)) {
+                       if (!asn1_read_BOOLEAN(data, &reverse)) {
                        return False;
                        }
                        lssc[num]->reverse = reverse;
                }
        
-               if (!asn1_end_tag(&data)) {
+               if (!asn1_end_tag(data)) {
                        return False;
                }
        }
@@ -142,7 +145,7 @@ static BOOL decode_server_sort_request(void *mem_ctx, DATA_BLOB in, void **out)
                lssc[num] = NULL;
        }
 
-       if (!asn1_end_tag(&data)) {
+       if (!asn1_end_tag(data)) {
                return False;
        }
 
@@ -153,10 +156,12 @@ static BOOL decode_server_sort_request(void *mem_ctx, DATA_BLOB in, void **out)
 
 static BOOL decode_extended_dn_request(void *mem_ctx, DATA_BLOB in, void **out)
 {
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
        struct ldb_extended_dn_control *ledc;
 
-       if (!asn1_load(&data, in)) {
+       if (!data) return False;
+
+       if (!asn1_load(data, in)) {
                return False;
        }
 
@@ -165,15 +170,15 @@ static BOOL decode_extended_dn_request(void *mem_ctx, DATA_BLOB in, void **out)
                return False;
        }
 
-       if (!asn1_start_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_read_Integer(&data, &(ledc->type))) {
+       if (!asn1_read_Integer(data, &(ledc->type))) {
                return False;
        }
        
-       if (!asn1_end_tag(&data)) {
+       if (!asn1_end_tag(data)) {
                return False;
        }
 
@@ -184,10 +189,12 @@ static BOOL decode_extended_dn_request(void *mem_ctx, DATA_BLOB in, void **out)
 
 static BOOL decode_sd_flags_request(void *mem_ctx, DATA_BLOB in, void **out)
 {
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
        struct ldb_sd_flags_control *lsdfc;
 
-       if (!asn1_load(&data, in)) {
+       if (!data) return False;
+
+       if (!asn1_load(data, in)) {
                return False;
        }
 
@@ -196,15 +203,15 @@ static BOOL decode_sd_flags_request(void *mem_ctx, DATA_BLOB in, void **out)
                return False;
        }
 
-       if (!asn1_start_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_read_Integer(&data, &(lsdfc->secinfo_flags))) {
+       if (!asn1_read_Integer(data, &(lsdfc->secinfo_flags))) {
                return False;
        }
 
-       if (!asn1_end_tag(&data)) {
+       if (!asn1_end_tag(data)) {
                return False;
        }
 
@@ -215,10 +222,12 @@ static BOOL decode_sd_flags_request(void *mem_ctx, DATA_BLOB in, void **out)
 
 static BOOL decode_search_options_request(void *mem_ctx, DATA_BLOB in, void **out)
 {
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
        struct ldb_search_options_control *lsoc;
 
-       if (!asn1_load(&data, in)) {
+       if (!data) return False;
+
+       if (!asn1_load(data, in)) {
                return False;
        }
 
@@ -227,15 +236,15 @@ static BOOL decode_search_options_request(void *mem_ctx, DATA_BLOB in, void **ou
                return False;
        }
 
-       if (!asn1_start_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_read_Integer(&data, &(lsoc->search_options))) {
+       if (!asn1_read_Integer(data, &(lsoc->search_options))) {
                return False;
        }
 
-       if (!asn1_end_tag(&data)) {
+       if (!asn1_end_tag(data)) {
                return False;
        }
 
@@ -247,10 +256,12 @@ static BOOL decode_search_options_request(void *mem_ctx, DATA_BLOB in, void **ou
 static BOOL decode_paged_results_request(void *mem_ctx, DATA_BLOB in, void **out)
 {
        DATA_BLOB cookie;
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
        struct ldb_paged_control *lprc;
 
-       if (!asn1_load(&data, in)) {
+       if (!data) return False;
+
+       if (!asn1_load(data, in)) {
                return False;
        }
 
@@ -259,15 +270,15 @@ static BOOL decode_paged_results_request(void *mem_ctx, DATA_BLOB in, void **out
                return False;
        }
 
-       if (!asn1_start_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_read_Integer(&data, &(lprc->size))) {
+       if (!asn1_read_Integer(data, &(lprc->size))) {
                return False;
        }
        
-       if (!asn1_read_OctetString(&data, &cookie)) {
+       if (!asn1_read_OctetString(data, mem_ctx, &cookie)) {
                return False;
        }
        lprc->cookie_len = cookie.length;
@@ -281,7 +292,7 @@ static BOOL decode_paged_results_request(void *mem_ctx, DATA_BLOB in, void **out
                lprc->cookie = NULL;
        }
 
-       if (!asn1_end_tag(&data)) {
+       if (!asn1_end_tag(data)) {
                return False;
        }
 
@@ -293,10 +304,12 @@ static BOOL decode_paged_results_request(void *mem_ctx, DATA_BLOB in, void **out
 static BOOL decode_dirsync_request(void *mem_ctx, DATA_BLOB in, void **out)
 {
        DATA_BLOB cookie;
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
        struct ldb_dirsync_control *ldc;
 
-       if (!asn1_load(&data, in)) {
+       if (!data) return False;
+
+       if (!asn1_load(data, in)) {
                return False;
        }
 
@@ -305,19 +318,19 @@ static BOOL decode_dirsync_request(void *mem_ctx, DATA_BLOB in, void **out)
                return False;
        }
 
-       if (!asn1_start_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_read_Integer(&data, &(ldc->flags))) {
+       if (!asn1_read_Integer(data, &(ldc->flags))) {
                return False;
        }
        
-       if (!asn1_read_Integer(&data, &(ldc->max_attributes))) {
+       if (!asn1_read_Integer(data, &(ldc->max_attributes))) {
                return False;
        }
        
-       if (!asn1_read_OctetString(&data, &cookie)) {
+       if (!asn1_read_OctetString(data, mem_ctx, &cookie)) {
                return False;
        }
        ldc->cookie_len = cookie.length;
@@ -331,7 +344,7 @@ static BOOL decode_dirsync_request(void *mem_ctx, DATA_BLOB in, void **out)
                ldc->cookie = NULL;
        }
 
-       if (!asn1_end_tag(&data)) {
+       if (!asn1_end_tag(data)) {
                return False;
        }
 
@@ -346,10 +359,12 @@ static BOOL decode_dirsync_request(void *mem_ctx, DATA_BLOB in, void **out)
 static BOOL decode_asq_control(void *mem_ctx, DATA_BLOB in, void **out)
 {
        DATA_BLOB source_attribute;
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
        struct ldb_asq_control *lac;
 
-       if (!asn1_load(&data, in)) {
+       if (!data) return False;
+
+       if (!asn1_load(data, in)) {
                return False;
        }
 
@@ -358,13 +373,13 @@ static BOOL decode_asq_control(void *mem_ctx, DATA_BLOB in, void **out)
                return False;
        }
 
-       if (!asn1_start_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (asn1_peek_tag(&data, ASN1_OCTET_STRING)) {
+       if (asn1_peek_tag(data, ASN1_OCTET_STRING)) {
 
-               if (!asn1_read_OctetString(&data, &source_attribute)) {
+               if (!asn1_read_OctetString(data, mem_ctx, &source_attribute)) {
                        return False;
                }
                lac->src_attr_len = source_attribute.length;
@@ -380,9 +395,9 @@ static BOOL decode_asq_control(void *mem_ctx, DATA_BLOB in, void **out)
 
                lac->request = 1;
 
-       } else if (asn1_peek_tag(&data, ASN1_ENUMERATED)) {
+       } else if (asn1_peek_tag(data, ASN1_ENUMERATED)) {
 
-               if (!asn1_read_enumerated(&data, &(lac->result))) {
+               if (!asn1_read_enumerated(data, &(lac->result))) {
                        return False;
                }
 
@@ -392,7 +407,7 @@ static BOOL decode_asq_control(void *mem_ctx, DATA_BLOB in, void **out)
                return False;
        }
 
-       if (!asn1_end_tag(&data)) {
+       if (!asn1_end_tag(data)) {
                return False;
        }
 
@@ -401,6 +416,15 @@ static BOOL decode_asq_control(void *mem_ctx, DATA_BLOB in, void **out)
        return True;
 }
 
+static BOOL decode_domain_scope_request(void *mem_ctx, DATA_BLOB in, void **out)
+{
+       if (in.length != 0) {
+               return False;
+       }
+
+       return True;
+}
+
 static BOOL decode_notification_request(void *mem_ctx, DATA_BLOB in, void **out)
 {
        if (in.length != 0) {
@@ -410,6 +434,24 @@ 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_permissive_modify_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) {
@@ -422,10 +464,12 @@ static BOOL decode_manageDSAIT_request(void *mem_ctx, DATA_BLOB in, void **out)
 static BOOL decode_vlv_request(void *mem_ctx, DATA_BLOB in, void **out)
 {
        DATA_BLOB assertion_value, context_id;
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
        struct ldb_vlv_req_control *lvrc;
 
-       if (!asn1_load(&data, in)) {
+       if (!data) return False;
+
+       if (!asn1_load(data, in)) {
                return False;
        }
 
@@ -434,43 +478,43 @@ static BOOL decode_vlv_request(void *mem_ctx, DATA_BLOB in, void **out)
                return False;
        }
 
-       if (!asn1_start_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_read_Integer(&data, &(lvrc->beforeCount))) {
+       if (!asn1_read_Integer(data, &(lvrc->beforeCount))) {
                return False;
        }
        
-       if (!asn1_read_Integer(&data, &(lvrc->afterCount))) {
+       if (!asn1_read_Integer(data, &(lvrc->afterCount))) {
                return False;
        }
 
-       if (asn1_peek_tag(&data, ASN1_CONTEXT(0))) {
+       if (asn1_peek_tag(data, ASN1_CONTEXT(0))) {
 
                lvrc->type = 0;
                
-               if (!asn1_start_tag(&data, ASN1_CONTEXT(0))) {
+               if (!asn1_start_tag(data, ASN1_CONTEXT(0))) {
                        return False;
                }
 
-               if (!asn1_start_tag(&data, ASN1_SEQUENCE(0))) {
+               if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                        return False;
                }
 
-               if (!asn1_read_Integer(&data, &(lvrc->match.byOffset.offset))) {
+               if (!asn1_read_Integer(data, &(lvrc->match.byOffset.offset))) {
                        return False;
                }
 
-               if (!asn1_read_Integer(&data, &(lvrc->match.byOffset.contentCount))) {
+               if (!asn1_read_Integer(data, &(lvrc->match.byOffset.contentCount))) {
                        return False;
                }
 
-               if (!asn1_end_tag(&data)) { /*SEQUENCE*/
+               if (!asn1_end_tag(data)) { /*SEQUENCE*/
                        return False;
                }
 
-               if (!asn1_end_tag(&data)) { /*CONTEXT*/
+               if (!asn1_end_tag(data)) { /*CONTEXT*/
                        return False;
                }
 
@@ -478,11 +522,11 @@ static BOOL decode_vlv_request(void *mem_ctx, DATA_BLOB in, void **out)
 
                lvrc->type = 1;
 
-               if (!asn1_start_tag(&data, ASN1_CONTEXT(1))) {
+               if (!asn1_start_tag(data, ASN1_CONTEXT(1))) {
                        return False;
                }
 
-               if (!asn1_read_OctetString(&data, &assertion_value)) {
+               if (!asn1_read_OctetString(data, mem_ctx, &assertion_value)) {
                        return False;
                }
                lvrc->match.gtOrEq.value_len = assertion_value.length;
@@ -496,13 +540,13 @@ static BOOL decode_vlv_request(void *mem_ctx, DATA_BLOB in, void **out)
                        lvrc->match.gtOrEq.value = NULL;
                }
 
-               if (!asn1_end_tag(&data)) { /*CONTEXT*/
+               if (!asn1_end_tag(data)) { /*CONTEXT*/
                        return False;
                }
        }
 
-       if (asn1_peek_tag(&data, ASN1_OCTET_STRING)) {
-               if (!asn1_read_OctetString(&data, &context_id)) {
+       if (asn1_peek_tag(data, ASN1_OCTET_STRING)) {
+               if (!asn1_read_OctetString(data, mem_ctx, &context_id)) {
                        return False;
                }
                lvrc->ctxid_len = context_id.length;
@@ -520,7 +564,7 @@ static BOOL decode_vlv_request(void *mem_ctx, DATA_BLOB in, void **out)
                lvrc->ctxid_len = 0;
        }
 
-       if (!asn1_end_tag(&data)) {
+       if (!asn1_end_tag(data)) {
                return False;
        }
 
@@ -532,10 +576,12 @@ static BOOL decode_vlv_request(void *mem_ctx, DATA_BLOB in, void **out)
 static BOOL decode_vlv_response(void *mem_ctx, DATA_BLOB in, void **out)
 {
        DATA_BLOB context_id;
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
        struct ldb_vlv_resp_control *lvrc;
 
-       if (!asn1_load(&data, in)) {
+       if (!data) return False;
+
+       if (!asn1_load(data, in)) {
                return False;
        }
 
@@ -544,24 +590,24 @@ static BOOL decode_vlv_response(void *mem_ctx, DATA_BLOB in, void **out)
                return False;
        }
 
-       if (!asn1_start_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_read_Integer(&data, &(lvrc->targetPosition))) {
+       if (!asn1_read_Integer(data, &(lvrc->targetPosition))) {
                return False;
        }
        
-       if (!asn1_read_Integer(&data, &(lvrc->contentCount))) {
+       if (!asn1_read_Integer(data, &(lvrc->contentCount))) {
                return False;
        }
        
-       if (!asn1_read_enumerated(&data, &(lvrc->vlv_result))) {
+       if (!asn1_read_enumerated(data, &(lvrc->vlv_result))) {
                return False;
        }
 
-       if (asn1_peek_tag(&data, ASN1_OCTET_STRING)) {
-               if (!asn1_read_OctetString(&data, &context_id)) {
+       if (asn1_peek_tag(data, ASN1_OCTET_STRING)) {
+               if (!asn1_read_OctetString(data, mem_ctx, &context_id)) {
                        return False;
                }
                lvrc->contextId = talloc_strndup(lvrc, (const char *)context_id.data, context_id.length);
@@ -574,7 +620,7 @@ static BOOL decode_vlv_response(void *mem_ctx, DATA_BLOB in, void **out)
                lvrc->ctxid_len = 0;
        }
 
-       if (!asn1_end_tag(&data)) {
+       if (!asn1_end_tag(data)) {
                return False;
        }
 
@@ -586,32 +632,33 @@ static BOOL decode_vlv_response(void *mem_ctx, DATA_BLOB in, void **out)
 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);
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
 
-       ZERO_STRUCT(data);
+       if (!data) return False;
 
-       if (!asn1_push_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_write_enumerated(&data, lsrc->result)) {
+       if (!asn1_write_enumerated(data, lsrc->result)) {
                return False;
        }
 
        if (lsrc->attr_desc) {
-               if (!asn1_write_OctetString(&data, lsrc->attr_desc, strlen(lsrc->attr_desc))) {
+               if (!asn1_write_OctetString(data, lsrc->attr_desc, strlen(lsrc->attr_desc))) {
                        return False;
                }
        }
 
-       if (!asn1_pop_tag(&data)) {
+       if (!asn1_pop_tag(data)) {
                return False;
        }
 
-       *out = data_blob_talloc(mem_ctx, data.data, data.length);
+       *out = data_blob_talloc(mem_ctx, data->data, data->length);
        if (out->data == NULL) {
                return False;
        }
+       talloc_free(data);
 
        return True;
 }
@@ -619,49 +666,50 @@ static BOOL encode_server_sort_response(void *mem_ctx, void *in, DATA_BLOB *out)
 static BOOL encode_server_sort_request(void *mem_ctx, void *in, DATA_BLOB *out)
 {
        struct ldb_server_sort_control **lssc = talloc_get_type(in, struct ldb_server_sort_control *);
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
        int num;
 
-       ZERO_STRUCT(data);
+       if (!data) return False;
 
-       if (!asn1_push_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
        for (num = 0; lssc[num]; num++) {
-               if (!asn1_push_tag(&data, ASN1_SEQUENCE(0))) {
+               if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                        return False;
                }
                
-               if (!asn1_write_OctetString(&data, lssc[num]->attributeName, strlen(lssc[num]->attributeName))) {
+               if (!asn1_write_OctetString(data, lssc[num]->attributeName, strlen(lssc[num]->attributeName))) {
                        return False;
                }
 
                if (lssc[num]->orderingRule) {
-                       if (!asn1_write_OctetString(&data, lssc[num]->orderingRule, strlen(lssc[num]->orderingRule))) {
+                       if (!asn1_write_OctetString(data, lssc[num]->orderingRule, strlen(lssc[num]->orderingRule))) {
                                return False;
                        }
                }
 
                if (lssc[num]->reverse) {
-                       if (!asn1_write_BOOLEAN(&data, lssc[num]->reverse)) {
+                       if (!asn1_write_BOOLEAN(data, lssc[num]->reverse)) {
                                return False;
                        }
                }
 
-               if (!asn1_pop_tag(&data)) {
+               if (!asn1_pop_tag(data)) {
                        return False;
                }
        }
 
-       if (!asn1_pop_tag(&data)) {
+       if (!asn1_pop_tag(data)) {
                return False;
        }
 
-       *out = data_blob_talloc(mem_ctx, data.data, data.length);
+       *out = data_blob_talloc(mem_ctx, data->data, data->length);
        if (out->data == NULL) {
                return False;
        }
+       talloc_free(data);
 
        return True;
 }
@@ -669,26 +717,27 @@ static BOOL encode_server_sort_request(void *mem_ctx, void *in, DATA_BLOB *out)
 static BOOL encode_extended_dn_request(void *mem_ctx, void *in, DATA_BLOB *out)
 {
        struct ldb_extended_dn_control *ledc = talloc_get_type(in, struct ldb_extended_dn_control);
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
 
-       ZERO_STRUCT(data);
+       if (!data) return False;
 
-       if (!asn1_push_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_write_Integer(&data, ledc->type)) {
+       if (!asn1_write_Integer(data, ledc->type)) {
                return False;
        }
 
-       if (!asn1_pop_tag(&data)) {
+       if (!asn1_pop_tag(data)) {
                return False;
        }
 
-       *out = data_blob_talloc(mem_ctx, data.data, data.length);
+       *out = data_blob_talloc(mem_ctx, data->data, data->length);
        if (out->data == NULL) {
                return False;
        }
+       talloc_free(data);
 
        return True;
 }
@@ -696,26 +745,27 @@ static BOOL encode_extended_dn_request(void *mem_ctx, void *in, DATA_BLOB *out)
 static BOOL encode_sd_flags_request(void *mem_ctx, void *in, DATA_BLOB *out)
 {
        struct ldb_sd_flags_control *lsdfc = talloc_get_type(in, struct ldb_sd_flags_control);
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
 
-       ZERO_STRUCT(data);
+       if (!data) return False;
 
-       if (!asn1_push_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_write_Integer(&data, lsdfc->secinfo_flags)) {
+       if (!asn1_write_Integer(data, lsdfc->secinfo_flags)) {
                return False;
        }
 
-       if (!asn1_pop_tag(&data)) {
+       if (!asn1_pop_tag(data)) {
                return False;
        }
 
-       *out = data_blob_talloc(mem_ctx, data.data, data.length);
+       *out = data_blob_talloc(mem_ctx, data->data, data->length);
        if (out->data == NULL) {
                return False;
        }
+       talloc_free(data);
 
        return True;
 }
@@ -723,26 +773,27 @@ static BOOL encode_sd_flags_request(void *mem_ctx, void *in, DATA_BLOB *out)
 static BOOL encode_search_options_request(void *mem_ctx, void *in, DATA_BLOB *out)
 {
        struct ldb_search_options_control *lsoc = talloc_get_type(in, struct ldb_search_options_control);
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
 
-       ZERO_STRUCT(data);
+       if (!data) return False;
 
-       if (!asn1_push_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_write_Integer(&data, lsoc->search_options)) {
+       if (!asn1_write_Integer(data, lsoc->search_options)) {
                return False;
        }
 
-       if (!asn1_pop_tag(&data)) {
+       if (!asn1_pop_tag(data)) {
                return False;
        }
 
-       *out = data_blob_talloc(mem_ctx, data.data, data.length);
+       *out = data_blob_talloc(mem_ctx, data->data, data->length);
        if (out->data == NULL) {
                return False;
        }
+       talloc_free(data);
 
        return True;
 }
@@ -750,30 +801,31 @@ static BOOL encode_search_options_request(void *mem_ctx, void *in, DATA_BLOB *ou
 static BOOL encode_paged_results_request(void *mem_ctx, void *in, DATA_BLOB *out)
 {
        struct ldb_paged_control *lprc = talloc_get_type(in, struct ldb_paged_control);
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
 
-       ZERO_STRUCT(data);
+       if (!data) return False;
 
-       if (!asn1_push_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_write_Integer(&data, lprc->size)) {
+       if (!asn1_write_Integer(data, lprc->size)) {
                return False;
        }
 
-       if (!asn1_write_OctetString(&data, lprc->cookie, lprc->cookie_len)) {
+       if (!asn1_write_OctetString(data, lprc->cookie, lprc->cookie_len)) {
                return False;
        }       
 
-       if (!asn1_pop_tag(&data)) {
+       if (!asn1_pop_tag(data)) {
                return False;
        }
 
-       *out = data_blob_talloc(mem_ctx, data.data, data.length);
+       *out = data_blob_talloc(mem_ctx, data->data, data->length);
        if (out->data == NULL) {
                return False;
        }
+       talloc_free(data);
 
        return True;
 }
@@ -784,33 +836,34 @@ static BOOL encode_paged_results_request(void *mem_ctx, void *in, DATA_BLOB *out
 static BOOL encode_asq_control(void *mem_ctx, void *in, DATA_BLOB *out)
 {
        struct ldb_asq_control *lac = talloc_get_type(in, struct ldb_asq_control);
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
 
-       ZERO_STRUCT(data);
+       if (!data) return False;
 
-       if (!asn1_push_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
        if (lac->request) {
 
-               if (!asn1_write_OctetString(&data, lac->source_attribute, lac->src_attr_len)) {
+               if (!asn1_write_OctetString(data, lac->source_attribute, lac->src_attr_len)) {
                        return False;
                }
        } else {
-               if (!asn1_write_enumerated(&data, lac->result)) {
+               if (!asn1_write_enumerated(data, lac->result)) {
                        return False;
                }
        }
 
-       if (!asn1_pop_tag(&data)) {
+       if (!asn1_pop_tag(data)) {
                return False;
        }
 
-       *out = data_blob_talloc(mem_ctx, data.data, data.length);
+       *out = data_blob_talloc(mem_ctx, data->data, data->length);
        if (out->data == NULL) {
                return False;
        }
+       talloc_free(data);
 
        return True;
 }
@@ -818,35 +871,46 @@ static BOOL encode_asq_control(void *mem_ctx, void *in, DATA_BLOB *out)
 static BOOL encode_dirsync_request(void *mem_ctx, void *in, DATA_BLOB *out)
 {
        struct ldb_dirsync_control *ldc = talloc_get_type(in, struct ldb_dirsync_control);
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
 
-       ZERO_STRUCT(data);
+       if (!data) return False;
 
-       if (!asn1_push_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_write_Integer(&data, ldc->flags)) {
+       if (!asn1_write_Integer(data, ldc->flags)) {
                return False;
        }
 
-       if (!asn1_write_Integer(&data, ldc->max_attributes)) {
+       if (!asn1_write_Integer(data, ldc->max_attributes)) {
                return False;
        }
 
-       if (!asn1_write_OctetString(&data, ldc->cookie, ldc->cookie_len)) {
+       if (!asn1_write_OctetString(data, ldc->cookie, ldc->cookie_len)) {
                return False;
        }       
 
-       if (!asn1_pop_tag(&data)) {
+       if (!asn1_pop_tag(data)) {
                return False;
        }
 
-       *out = data_blob_talloc(mem_ctx, data.data, data.length);
+       *out = data_blob_talloc(mem_ctx, data->data, data->length);
        if (out->data == NULL) {
                return False;
        }
+       talloc_free(data);
+
+       return True;
+}
+
+static BOOL encode_domain_scope_request(void *mem_ctx, void *in, DATA_BLOB *out)
+{
+       if (in) {
+               return False;
+       }
 
+       *out = data_blob(NULL, 0);
        return True;
 }
 
@@ -860,6 +924,26 @@ 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_permissive_modify_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) {
@@ -873,74 +957,75 @@ static BOOL encode_manageDSAIT_request(void *mem_ctx, void *in, DATA_BLOB *out)
 static BOOL encode_vlv_request(void *mem_ctx, void *in, DATA_BLOB *out)
 {
        struct ldb_vlv_req_control *lvrc = talloc_get_type(in, struct ldb_vlv_req_control);
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
 
-       ZERO_STRUCT(data);
+       if (!data) return False;
 
-       if (!asn1_push_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_write_Integer(&data, lvrc->beforeCount)) {
+       if (!asn1_write_Integer(data, lvrc->beforeCount)) {
                return False;
        }
 
-       if (!asn1_write_Integer(&data, lvrc->afterCount)) {
+       if (!asn1_write_Integer(data, lvrc->afterCount)) {
                return False;
        }
 
        if (lvrc->type == 0) {
-               if (!asn1_push_tag(&data, ASN1_CONTEXT(0))) {
+               if (!asn1_push_tag(data, ASN1_CONTEXT(0))) {
                        return False;
                }
                
-               if (!asn1_push_tag(&data, ASN1_SEQUENCE(0))) {
+               if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                        return False;
                }
                
-               if (!asn1_write_Integer(&data, lvrc->match.byOffset.offset)) {
+               if (!asn1_write_Integer(data, lvrc->match.byOffset.offset)) {
                        return False;
                }
 
-               if (!asn1_write_Integer(&data, lvrc->match.byOffset.contentCount)) {
+               if (!asn1_write_Integer(data, lvrc->match.byOffset.contentCount)) {
                        return False;
                }
 
-               if (!asn1_pop_tag(&data)) { /*SEQUENCE*/
+               if (!asn1_pop_tag(data)) { /*SEQUENCE*/
                        return False;
                }
 
-               if (!asn1_pop_tag(&data)) { /*CONTEXT*/
+               if (!asn1_pop_tag(data)) { /*CONTEXT*/
                        return False;
                }
        } else {
-               if (!asn1_push_tag(&data, ASN1_CONTEXT(1))) {
+               if (!asn1_push_tag(data, ASN1_CONTEXT(1))) {
                        return False;
                }
                
-               if (!asn1_write_OctetString(&data, lvrc->match.gtOrEq.value, lvrc->match.gtOrEq.value_len)) {
+               if (!asn1_write_OctetString(data, lvrc->match.gtOrEq.value, lvrc->match.gtOrEq.value_len)) {
                        return False;
                }
 
-               if (!asn1_pop_tag(&data)) { /*CONTEXT*/
+               if (!asn1_pop_tag(data)) { /*CONTEXT*/
                        return False;
                }
        }
 
        if (lvrc->ctxid_len) {
-               if (!asn1_write_OctetString(&data, lvrc->contextId, lvrc->ctxid_len)) {
+               if (!asn1_write_OctetString(data, lvrc->contextId, lvrc->ctxid_len)) {
                        return False;
                }
        }
 
-       if (!asn1_pop_tag(&data)) {
+       if (!asn1_pop_tag(data)) {
                return False;
        }
 
-       *out = data_blob_talloc(mem_ctx, data.data, data.length);
+       *out = data_blob_talloc(mem_ctx, data->data, data->length);
        if (out->data == NULL) {
                return False;
        }
+       talloc_free(data);
 
        return True;
 }
@@ -948,40 +1033,41 @@ static BOOL encode_vlv_request(void *mem_ctx, void *in, DATA_BLOB *out)
 static BOOL encode_vlv_response(void *mem_ctx, void *in, DATA_BLOB *out)
 {
        struct ldb_vlv_resp_control *lvrc = talloc_get_type(in, struct ldb_vlv_resp_control);
-       struct asn1_data data;
+       struct asn1_data *data = asn1_init(mem_ctx);
 
-       ZERO_STRUCT(data);
+       if (!data) return False;
 
-       if (!asn1_push_tag(&data, ASN1_SEQUENCE(0))) {
+       if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_write_Integer(&data, lvrc->targetPosition)) {
+       if (!asn1_write_Integer(data, lvrc->targetPosition)) {
                return False;
        }
 
-       if (!asn1_write_Integer(&data, lvrc->contentCount)) {
+       if (!asn1_write_Integer(data, lvrc->contentCount)) {
                return False;
        }
 
-       if (!asn1_write_enumerated(&data, lvrc->vlv_result)) {
+       if (!asn1_write_enumerated(data, lvrc->vlv_result)) {
                return False;
        }
 
        if (lvrc->ctxid_len) {
-               if (!asn1_write_OctetString(&data, lvrc->contextId, lvrc->ctxid_len)) {
+               if (!asn1_write_OctetString(data, lvrc->contextId, lvrc->ctxid_len)) {
                        return False;
                }
        }
 
-       if (!asn1_pop_tag(&data)) {
+       if (!asn1_pop_tag(data)) {
                return False;
        }
 
-       *out = data_blob_talloc(mem_ctx, data.data, data.length);
+       *out = data_blob_talloc(mem_ctx, data->data, data->length);
        if (out->data == NULL) {
                return False;
        }
+       talloc_free(data);
 
        return True;
 }
@@ -994,25 +1080,49 @@ 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.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 },
        { "1.2.840.113556.1.4.1340", decode_search_options_request, encode_search_options_request },
        { "2.16.840.1.113730.3.4.2", decode_manageDSAIT_request, encode_manageDSAIT_request },
        { "2.16.840.1.113730.3.4.9", decode_vlv_request, encode_vlv_request },
        { "2.16.840.1.113730.3.4.10", decode_vlv_response, encode_vlv_response },
+/* DSDB_CONTROL_CURRENT_PARTITION_OID is internal only, and has no network representation */
+       { "1.3.6.1.4.1.7165.4.3.2", NULL, NULL },
+/* 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 },
        { NULL, NULL, NULL }
 };
 
-BOOL ldap_decode_control(void *mem_ctx, struct asn1_data *data, struct ldb_control *ctrl)
+BOOL ldap_decode_control_value(void *mem_ctx, DATA_BLOB value, struct ldb_control *ctrl)
 {
        int i;
+
+       for (i = 0; ldap_known_controls[i].oid != NULL; i++) {
+               if (strcmp(ldap_known_controls[i].oid, ctrl->oid) == 0) {
+                       if (!ldap_known_controls[i].decode || !ldap_known_controls[i].decode(mem_ctx, value, &ctrl->data)) {
+                               return False;
+                       }
+                       break;
+               }
+       }
+       if (ldap_known_controls[i].oid == NULL) {
+               return False;
+       }
+
+       return True;
+}
+
+BOOL ldap_decode_control_wrapper(void *mem_ctx, struct asn1_data *data, struct ldb_control *ctrl, DATA_BLOB *value)
+{
        DATA_BLOB oid;
-       DATA_BLOB value;
 
        if (!asn1_start_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
 
-       if (!asn1_read_OctetString(data, &oid)) {
+       if (!asn1_read_OctetString(data, mem_ctx, &oid)) {
                return False;
        }
        ctrl->oid = talloc_strndup(mem_ctx, (char *)oid.data, oid.length);
@@ -1036,19 +1146,7 @@ BOOL ldap_decode_control(void *mem_ctx, struct asn1_data *data, struct ldb_contr
                goto end_tag;
        }
 
-       if (!asn1_read_OctetString(data, &value)) {
-               return False;
-       }
-
-       for (i = 0; ldap_known_controls[i].oid != NULL; i++) {
-               if (strcmp(ldap_known_controls[i].oid, ctrl->oid) == 0) {
-                       if (!ldap_known_controls[i].decode(mem_ctx, value, &ctrl->data)) {
-                               return False;
-                       }
-                       break;
-               }
-       }
-       if (ldap_known_controls[i].oid == NULL) {
+       if (!asn1_read_OctetString(data, mem_ctx, value)) {
                return False;
        }
 
@@ -1065,6 +1163,26 @@ BOOL ldap_encode_control(void *mem_ctx, struct asn1_data *data, struct ldb_contr
        DATA_BLOB value;
        int i;
 
+       for (i = 0; ldap_known_controls[i].oid != NULL; i++) {
+               if (strcmp(ldap_known_controls[i].oid, ctrl->oid) == 0) {
+                       if (!ldap_known_controls[i].encode) {
+                               if (ctrl->critical) {
+                                       return False;
+                               } else {
+                                       /* not encoding this control */
+                                       return True;
+                               }
+                       }
+                       if (!ldap_known_controls[i].encode(mem_ctx, ctrl->data, &value)) {
+                               return False;
+                       }
+                       break;
+               }
+       }
+       if (ldap_known_controls[i].oid == NULL) {
+               return False;
+       }
+
        if (!asn1_push_tag(data, ASN1_SEQUENCE(0))) {
                return False;
        }
@@ -1083,18 +1201,6 @@ BOOL ldap_encode_control(void *mem_ctx, struct asn1_data *data, struct ldb_contr
                goto pop_tag;
        }
 
-       for (i = 0; ldap_known_controls[i].oid != NULL; i++) {
-               if (strcmp(ldap_known_controls[i].oid, ctrl->oid) == 0) {
-                       if (!ldap_known_controls[i].encode(mem_ctx, ctrl->data, &value)) {
-                               return False;
-                       }
-                       break;
-               }
-       }
-       if (ldap_known_controls[i].oid == NULL) {
-               return False;
-       }
-
        if (!asn1_write_OctetString(data, value.data, value.length)) {
                return False;
        }
Unnamed repository; edit this file 'description' to name the repository.