Changeset 988 for vendor/current/source3/lib/tldap_util.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/tldap_util.c (modified) (13 diffs)

vendor/current/source3/lib/tldap_util.c

@@ -76 +76 @@
 
         if (!tldap_get_single_valueblob(msg, attribute, &val)) {
-                return false;
+                return ;
         }
         if (!convert_string_talloc(mem_ctx, CH_UTF8, CH_UNIX,
                                    val.data, val.length,
-                                   &result, &len, false)) {
+                                   &result, &len)) {
                 return NULL;
         }
@@ -94 +94 @@
                 return false;
         }
-        return sid_parse((char *)val.data, val.length, sid);
+        return sid_parse(val.data, val.length, sid);
 }
 
@@ -199 +199 @@
 
         if (!convert_string_talloc(talloc_tos(), CH_UNIX, CH_UTF8, str,
-                                   strlen(str), &utf8.data, &utf8.length,
-                                   false)) {
+                                   strlen(str), &utf8.data, &utf8.length)) {
                 return false;
         }
@@ -292 +291 @@
 
         if (!convert_string_talloc(talloc_tos(), CH_UTF8, CH_UNIX, d1->data,
-                                   d1->length, &s1, &s1len, false)) {
+                                   d1->length, &s1, &s1len)) {
                 /* can't do much here */
                 return 0;
         }
         if (!convert_string_talloc(talloc_tos(), CH_UTF8, CH_UNIX, d2->data,
-                                   d2->length, &s2, &s2len, false)) {
+                                   d2->length, &s2, &s2len)) {
                 /* can't do much here */
                 TALLOC_FREE(s1);
                 return 0;
         }
-        ret = StrCaseCmp(s1, s2);
+        ret = (s1, s2);
         TALLOC_FREE(s2);
         TALLOC_FREE(s1);
@@ -327 +326 @@
         blob.length = strlen(newval);
         if (blob.length != 0) {
-                blob.data = CONST_DISCARD(uint8_t *, newval);
+                blob.data = , newval);
         }
         ret = tldap_make_mod_blob_int(existing, mem_ctx, pmods, pnum_mods,
@@ -516 +515 @@
         int result;
 
-        ev = event_context_init(frame);
+        ev = event_context_init(frame);
         if (ev == NULL) {
                 result = TLDAP_NO_MEMORY;
@@ -637 +636 @@
 {
         struct tldap_control *pgctrl;
-        struct asn1_data *asn1;
+        struct asn1_data *asn1;
 
         asn1 = asn1_init(state);
@@ -643 +642 @@
                 return NULL;
         }
-        asn1_push_tag(asn1, ASN1_SEQUENCE(0));
-        asn1_write_Integer(asn1, state->page_size);
-        asn1_write_OctetString(asn1, state->cookie.data, state->cookie.length);
-        asn1_pop_tag(asn1);
-        if (asn1->has_error) {
-                TALLOC_FREE(asn1);
-                return NULL;
-        }
+        if (!asn1_push_tag(asn1, ASN1_SEQUENCE(0))) goto err;
+        if (!asn1_write_Integer(asn1, state->page_size)) goto err;
+        if (!asn1_write_OctetString(asn1, state->cookie.data, state->cookie.length)) goto err;
+        if (!asn1_pop_tag(asn1)) goto err;
         state->asn1 = asn1;
 
@@ -657 +652 @@
         pgctrl->critical = true;
         if (!asn1_blob(state->asn1, &pgctrl->value)) {
-                TALLOC_FREE(asn1);
-                return NULL;
+                goto err;
         }
         return tldap_search_send(mem_ctx, state->ev, state->ld, state->base,
@@ -667 +661 @@
                                  state->timelimit, state->sizelimit,
                                  state->deref);
+
+
+
+
+
 }
 
@@ -739 +738 @@
         struct tldap_search_paged_state *state = tevent_req_data(
                 req, struct tldap_search_paged_state);
-        struct asn1_data *asn1;
+        struct asn1_data *asn1;
         struct tldap_control *pgctrl;
         int rc, size;
@@ -786 +785 @@
 
         asn1_load_nocopy(asn1, pgctrl->value.data, pgctrl->value.length);
-        asn1_start_tag(asn1, ASN1_SEQUENCE(0));
-        asn1_read_Integer(asn1, &size);
-        asn1_read_OctetString(asn1, state, &state->cookie);
-        asn1_end_tag(asn1);
-        if (asn1->has_error) {
-                tevent_req_error(req, TLDAP_DECODING_ERROR);
-                return;
-        }
+        if (!asn1_start_tag(asn1, ASN1_SEQUENCE(0))) goto err;
+        if (!asn1_read_Integer(asn1, &size)) goto err;
+        if (!asn1_read_OctetString(asn1, state, &state->cookie)) goto err;
+        if (!asn1_end_tag(asn1)) goto err;
+
         TALLOC_FREE(asn1);
 
@@ -809 +805 @@
         }
         tevent_req_set_callback(subreq, tldap_search_paged_done, req);
+
+
+
+
+
+
 }