4 files changed, 2 insertions, 115 deletions
diff --git a/source4/headermap.txt b/source4/headermap.txt
index 6417603d1d..8287044622 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -51,7 +51,7 @@ param/share.h: share.h
 ../lib/util/wrap_xattr.h: wrap_xattr.h
 ../libcli/ldap/ldap_message.h: ldap_message.h
 ../libcli/ldap/ldap_errors.h: ldap_errors.h
-libcli/ldap/ldap_ndr.h: ldap_ndr.h
+../libcli/ldap/ldap_ndr.h: ldap_ndr.h
 ../lib/tevent/tevent.h: tevent.h
 ../lib/tevent/tevent_internal.h: tevent_internal.h
 auth/session.h: samba/session.h
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index a1f34a6513..f0c0f5295d 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -1,7 +1,7 @@
 [SUBSYSTEM::LIBCLI_LDAP]
 PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTEVENT LIBPACKET
 PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS \
-		       LDAP_ENCODE LIBNDR LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE
+		       LIBCLI_LDAP_NDR LIBNDR LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE
 
 LIBCLI_LDAP_OBJ_FILES = $(addprefix $(libclisrcdir)/ldap/, \
 					   ldap_client.o ldap_bind.o \
@@ -10,8 +10,3 @@ PUBLIC_HEADERS += $(libclisrcdir)/ldap/ldap.h
 
 $(eval $(call proto_header_template,$(libclisrcdir)/ldap/ldap_proto.h,$(LIBCLI_LDAP_OBJ_FILES:.o=.c)))
 
-[SUBSYSTEM::LDAP_ENCODE]
-PRIVATE_DEPENDENCIES = LIBLDB
-
-LDAP_ENCODE_OBJ_FILES = $(libclisrcdir)/ldap/ldap_ndr.o
-PUBLIC_HEADERS += $(libclisrcdir)/ldap/ldap_ndr.h
diff --git a/source4/libcli/ldap/ldap_ndr.c b/source4/libcli/ldap/ldap_ndr.c
deleted file mode 100644
index f0a11ba41f..0000000000
--- a/source4/libcli/ldap/ldap_ndr.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
-   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/>.
-   
-*/
-
-#include "includes.h"
-#include "libcli/ldap/ldap.h"
-#include "librpc/gen_ndr/ndr_security.h"
-#include "librpc/gen_ndr/ndr_misc.h"
-#include "libcli/ldap/ldap_ndr.h"
-
-/*
-  encode a NDR uint32 as a ldap filter element
-*/
-char *ldap_encode_ndr_uint32(TALLOC_CTX *mem_ctx, uint32_t value)
-{
-	uint8_t buf[4];
-	struct ldb_val val;
-	SIVAL(buf, 0, value);
-	val.data = buf;
-	val.length = 4;
-	return ldb_binary_encode(mem_ctx, val);
-}
-
-/*
-  encode a NDR dom_sid as a ldap filter element
-*/
-char *ldap_encode_ndr_dom_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
-{
-	DATA_BLOB blob;
-	enum ndr_err_code ndr_err;
-	char *ret;
-	ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, sid,
-				       (ndr_push_flags_fn_t)ndr_push_dom_sid);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		return NULL;
-	}
-	ret = ldb_binary_encode(mem_ctx, blob);
-	data_blob_free(&blob);
-	return ret;
-}
-
-
-/*
-  encode a NDR GUID as a ldap filter element
-*/
-char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, struct GUID *guid)
-{
-	DATA_BLOB blob;
-	enum ndr_err_code ndr_err;
-	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)) {
-		return NULL;
-	}
-	ret = ldb_binary_encode(mem_ctx, blob);
-	data_blob_free(&blob);
-	return ret;
-}
-
-/*
-  decode a NDR GUID from a ldap filter element
-*/
-NTSTATUS ldap_decode_ndr_GUID(TALLOC_CTX *mem_ctx, struct ldb_val val, struct GUID *guid)
-{
-	DATA_BLOB blob;
-	enum ndr_err_code ndr_err;
-
-	blob.data = val.data;
-	blob.length = val.length;
-	ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, guid,
-				       (ndr_pull_flags_fn_t)ndr_pull_GUID);
-	talloc_free(val.data);
-	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-		return ndr_map_error2ntstatus(ndr_err);
-	}
-	return NT_STATUS_OK;
-}
diff --git a/source4/libcli/ldap/ldap_ndr.h b/source4/libcli/ldap/ldap_ndr.h
deleted file mode 100644
index ee1f702c78..0000000000
--- a/source4/libcli/ldap/ldap_ndr.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __LIBCLI_LDAP_LDAP_NDR_H__
-#define __LIBCLI_LDAP_LDAP_NDR_H__
-
-#include "librpc/gen_ndr/ndr_misc.h"
-
-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);
-NTSTATUS ldap_decode_ndr_GUID(TALLOC_CTX *mem_ctx, struct ldb_val val, struct GUID *guid);
-
-#endif /* __LIBCLI_LDAP_LDAP_NDR_H__ */
-