Fix the mess with ldb includes.

Separate again the public from the private headers.

Add a new header specific for modules.
Also add service function for modules as now ldb_context and ldb_module are
opaque structures for them.

5 files changed, 69 insertions, 45 deletions

diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index 11157c5b63..2708c66b68 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -13,6 +13,6 @@ PUBLIC_HEADERS += $(libclisrcdir)/ldap/ldap.h $(libclisrcdir)/ldap/ldap_ndr.h
 $(eval $(call proto_header_template,$(libclisrcdir)/ldap/ldap_proto.h,$(LIBCLI_LDAP_OBJ_FILES:.o=.c)))
 
 [SUBSYSTEM::LDAP_ENCODE]
-# FIXME PRIVATE_DEPENDENCIES = LIBLDB
+PRIVATE_DEPENDENCIES = LIBLDB
 
 LDAP_ENCODE_OBJ_FILES = $(libclisrcdir)/ldap/ldap_ndr.o
diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h
index 5538c9dc06..abb4617c48 100644
--- a/source4/libcli/ldap/ldap.h
+++ b/source4/libcli/ldap/ldap.h
@@ -21,6 +21,7 @@
 #ifndef _SMB_LDAP_H_
 #define _SMB_LDAP_H_
 
+#include "libcli/ldap/ldap_errors.h"
 #include "lib/ldb/include/ldb.h"
 #include "librpc/gen_ndr/misc.h"
 
@@ -52,48 +53,6 @@ enum ldap_auth_mechanism {
 	LDAP_AUTH_MECH_SASL = 3
 };
 
-enum ldap_result_code {
-	LDAP_SUCCESS				= 0,
-	LDAP_OPERATIONS_ERROR			= 1,
-	LDAP_PROTOCOL_ERROR			= 2,
-	LDAP_TIME_LIMIT_EXCEEDED		= 3,
-	LDAP_SIZE_LIMIT_EXCEEDED		= 4,
-	LDAP_COMPARE_FALSE			= 5,
-	LDAP_COMPARE_TRUE			= 6,
-	LDAP_AUTH_METHOD_NOT_SUPPORTED		= 7,
-	LDAP_STRONG_AUTH_REQUIRED		= 8,
-	LDAP_REFERRAL				= 10,
-	LDAP_ADMIN_LIMIT_EXCEEDED		= 11,
-	LDAP_UNAVAILABLE_CRITICAL_EXTENSION	= 12,
-	LDAP_CONFIDENTIALITY_REQUIRED		= 13,
-	LDAP_SASL_BIND_IN_PROGRESS		= 14,
-	LDAP_NO_SUCH_ATTRIBUTE			= 16,
-	LDAP_UNDEFINED_ATTRIBUTE_TYPE		= 17,
-	LDAP_INAPPROPRIATE_MATCHING		= 18,
-	LDAP_CONSTRAINT_VIOLATION		= 19,
-	LDAP_ATTRIBUTE_OR_VALUE_EXISTS		= 20,
-	LDAP_INVALID_ATTRIBUTE_SYNTAX		= 21,
-	LDAP_NO_SUCH_OBJECT			= 32,
-	LDAP_ALIAS_PROBLEM			= 33,
-	LDAP_INVALID_DN_SYNTAX			= 34,
-	LDAP_ALIAS_DEREFERENCING_PROBLEM	= 36,
-	LDAP_INAPPROPRIATE_AUTHENTICATION	= 48,
-	LDAP_INVALID_CREDENTIALS		= 49,
-	LDAP_INSUFFICIENT_ACCESS_RIGHTS		= 50,
-	LDAP_BUSY				= 51,
-	LDAP_UNAVAILABLE			= 52,
-	LDAP_UNWILLING_TO_PERFORM		= 53,
-	LDAP_LOOP_DETECT			= 54,
-	LDAP_NAMING_VIOLATION			= 64,
-	LDAP_OBJECT_CLASS_VIOLATION		= 65,
-	LDAP_NOT_ALLOWED_ON_NON_LEAF		= 66,
-	LDAP_NOT_ALLOWED_ON_RDN			= 67,
-	LDAP_ENTRY_ALREADY_EXISTS		= 68,
-	LDAP_OBJECT_CLASS_MODS_PROHIBITED	= 69,
-	LDAP_AFFECTS_MULTIPLE_DSAS		= 71,
-	LDAP_OTHER 				= 80
-};
-
 struct ldap_Result {
 	int resultcode;
 	const char *dn;
diff --git a/source4/libcli/ldap/ldap_errors.h b/source4/libcli/ldap/ldap_errors.h
new file mode 100644
index 0000000000..17ac43814c
--- /dev/null
+++ b/source4/libcli/ldap/ldap_errors.h
@@ -0,0 +1,66 @@
+/* 
+   Unix SMB/CIFS Implementation.
+   LDAP protocol helper functions for SAMBA
+   Copyright (C) Volker Lendecke 2004
+    
+   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 _SMB_LDAP_ERRORS_H_
+#define _SMB_LDAP_ERRORS_H_
+
+enum ldap_result_code {
+	LDAP_SUCCESS				= 0,
+	LDAP_OPERATIONS_ERROR			= 1,
+	LDAP_PROTOCOL_ERROR			= 2,
+	LDAP_TIME_LIMIT_EXCEEDED		= 3,
+	LDAP_SIZE_LIMIT_EXCEEDED		= 4,
+	LDAP_COMPARE_FALSE			= 5,
+	LDAP_COMPARE_TRUE			= 6,
+	LDAP_AUTH_METHOD_NOT_SUPPORTED		= 7,
+	LDAP_STRONG_AUTH_REQUIRED		= 8,
+	LDAP_REFERRAL				= 10,
+	LDAP_ADMIN_LIMIT_EXCEEDED		= 11,
+	LDAP_UNAVAILABLE_CRITICAL_EXTENSION	= 12,
+	LDAP_CONFIDENTIALITY_REQUIRED		= 13,
+	LDAP_SASL_BIND_IN_PROGRESS		= 14,
+	LDAP_NO_SUCH_ATTRIBUTE			= 16,
+	LDAP_UNDEFINED_ATTRIBUTE_TYPE		= 17,
+	LDAP_INAPPROPRIATE_MATCHING		= 18,
+	LDAP_CONSTRAINT_VIOLATION		= 19,
+	LDAP_ATTRIBUTE_OR_VALUE_EXISTS		= 20,
+	LDAP_INVALID_ATTRIBUTE_SYNTAX		= 21,
+	LDAP_NO_SUCH_OBJECT			= 32,
+	LDAP_ALIAS_PROBLEM			= 33,
+	LDAP_INVALID_DN_SYNTAX			= 34,
+	LDAP_ALIAS_DEREFERENCING_PROBLEM	= 36,
+	LDAP_INAPPROPRIATE_AUTHENTICATION	= 48,
+	LDAP_INVALID_CREDENTIALS		= 49,
+	LDAP_INSUFFICIENT_ACCESS_RIGHTS		= 50,
+	LDAP_BUSY				= 51,
+	LDAP_UNAVAILABLE			= 52,
+	LDAP_UNWILLING_TO_PERFORM		= 53,
+	LDAP_LOOP_DETECT			= 54,
+	LDAP_NAMING_VIOLATION			= 64,
+	LDAP_OBJECT_CLASS_VIOLATION		= 65,
+	LDAP_NOT_ALLOWED_ON_NON_LEAF		= 66,
+	LDAP_NOT_ALLOWED_ON_RDN			= 67,
+	LDAP_ENTRY_ALREADY_EXISTS		= 68,
+	LDAP_OBJECT_CLASS_MODS_PROHIBITED	= 69,
+	LDAP_AFFECTS_MULTIPLE_DSAS		= 71,
+	LDAP_OTHER 				= 80
+};
+
+#endif /* _SMB_LDAP_ERRORS_H_ */
diff --git a/source4/libcli/security/security_token.c b/source4/libcli/security/security_token.c
index 0680c54258..e1349e06f8 100644
--- a/source4/libcli/security/security_token.c
+++ b/source4/libcli/security/security_token.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "dsdb/samdb/samdb.h"
 #include "libcli/security/security.h"
 #include "auth/session.h"
 
diff --git a/source4/libcli/util/nterr.c b/source4/libcli/util/nterr.c
index e94ed36d39..8371837dcb 100644
--- a/source4/libcli/util/nterr.c
+++ b/source4/libcli/util/nterr.c
@@ -20,7 +20,7 @@
 /* NT error codes.  please read nterr.h */
 
 #include "includes.h"
-#include "libcli/ldap/ldap.h"
+#include "libcli/ldap/ldap_errors.h"
 #undef strcasecmp
 
 typedef struct