Changeset 745 for trunk/server/libcli/ldap/ldap_message.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• libcli/ldap/ldap_message.c (modified) (4 diffs)

trunk/server/libcli/ldap/ldap_message.c

@@ -168 +168 @@
 
         for (i = 0; handlers[i].oid != NULL; i++) {
+                if (!ctrl->oid) {
+                        /* not encoding this control, the OID has been
+                         * set to NULL indicating it isn't really
+                         * here */
+                        return true;
+                }
                 if (strcmp(handlers[i].oid, ctrl->oid) == 0) {
                         if (!handlers[i].encode) {
@@ -435 +441 @@
         case LDAP_TAG_UnbindRequest: {
 /*              struct ldap_UnbindRequest *r = &msg->r.UnbindRequest; */
+                asn1_push_tag(data, ASN1_APPLICATION_SIMPLE(msg->type));
+                asn1_pop_tag(data);
                 break;
         }
@@ -669 +677 @@
                                                  control_handlers,
                                                  msg->controls[i])) {
+                                DEBUG(1,("Unable to encode control %s\n",
+                                         msg->controls[i]->oid));
                                 return false;
                         }
@@ -1608 +1618 @@
 NTSTATUS ldap_full_packet(void *private_data, DATA_BLOB blob, size_t *packet_size)
 {
-        return asn1_full_tag(blob, ASN1_SEQUENCE(0), packet_size);
-}
+        if (blob.length < 6) {
+                /*
+                 * We need at least 6 bytes to workout the length
+                 * of the pdu.
+                 */
+                return STATUS_MORE_ENTRIES;
+        }
+        return asn1_peek_full_tag(blob, ASN1_SEQUENCE(0), packet_size);
+}