Changeset 740 for vendor/current/libcli/ldap

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/libcli/ldap

Files:

• config.mk (deleted)
• ldap_message.c (modified) (4 diffs)
• ldap_message.h (modified) (1 diff)
• ldap_ndr.c (modified) (4 diffs)
• ldap_ndr.h (modified) (2 diffs)
• wscript_build (added)

vendor/current/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);
+}

vendor/current/libcli/ldap/ldap_message.h

@@ -23 +23 @@
 
 #include "../libcli/ldap/ldap_errors.h"
-#include "lib/ldb/include/ldb.h"
+#if _SAMBA_BUILD_ == 3
+#include "lib/ldb_compat.h"
+#else
+#include <ldb.h>
+#endif
 
 enum ldap_request_tag {

vendor/current/libcli/ldap/ldap_ndr.c

@@ -22 +22 @@
 
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
+#if _SAMBA_BUILD_ == 3
+#include "lib/ldb_compat.h"
+#else
+#include <ldb.h>
+#endif
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
@@ -48 +52 @@
         enum ndr_err_code ndr_err;
         char *ret;
-        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, sid,
+        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, sid,
                                        (ndr_push_flags_fn_t)ndr_push_dom_sid);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -62 +66 @@
   encode a NDR GUID as a ldap filter element
 */
-char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, struct GUID *guid)
+char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, const struct GUID *guid)
 {
         DATA_BLOB blob;
-        enum ndr_err_code ndr_err;
+        NTSTATUS status;
         char *ret;
-        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, guid,
-                                       (ndr_push_flags_fn_t)ndr_push_GUID);
-        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+        status = GUID_to_ndr_blob(guid, mem_ctx, &blob);
+        if (!NT_STATUS_IS_OK(status)) {
                 return NULL;
         }
@@ -87 +90 @@
         blob.data = val.data;
         blob.length = val.length;
-        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, guid,
+        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, guid,
                                        (ndr_pull_flags_fn_t)ndr_pull_GUID);
         talloc_free(val.data);

vendor/current/libcli/ldap/ldap_ndr.h

@@ +1 @@
+/*
+   Unix SMB/CIFS mplementation.
+
+   wrap/unwrap NDR encoded elements for ldap calls
+
+   Copyright (C) Andrew Tridgell  2005
+
+   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 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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, see <http://www.gnu.org/licenses/>.
+
+*/
+
 #ifndef __LIBCLI_LDAP_LDAP_NDR_H__
 #define __LIBCLI_LDAP_LDAP_NDR_H__
@@ -6 +28 @@
 char *ldap_encode_ndr_uint32(TALLOC_CTX *mem_ctx, uint32_t value);
 char *ldap_encode_ndr_dom_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid);
-char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, struct GUID *guid);
+char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, const struct GUID *guid);
 NTSTATUS ldap_decode_ndr_GUID(TALLOC_CTX *mem_ctx, struct ldb_val val, struct GUID *guid);