s3-tldap: only include tldap when actually needed.

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 169b7c0f5811856bc7edea8bbf54217d3ed7217a..07b31c24065f3e44bbbf865f945faedb22a6a3a9 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -680,8 +680,6 @@ struct ntlmssp_state;
 #include "talloc_dict.h"
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
-#include "tldap.h"
-#include "tldap_util.h"
 
 #include "lib/smbconf/smbconf.h"
 #include "lib/smbconf/smbconf_init.h"

diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index fffa42cd3392feba5b30428de288290cce57e757..25f39ed8a2808ff1975c1f259bddcb627627e7a2 100644 (file)
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "tldap.h"
 
 bool tevent_req_is_ldap_error(struct tevent_req *req, int *perr)
 {

diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c
index f9f54aaf4d43f4f8f96ea7ba307b0d74c8958afa..5ff796137f798783efbab00b249f7e2c8bd99916 100644 (file)
--- a/source3/lib/tldap_util.c
+++ b/source3/lib/tldap_util.c
@@ -18,6 +18,8 @@
 */
 
 #include "includes.h"
+#include "tldap.h"
+#include "tldap_util.h"
 
 bool tldap_entry_values(struct tldap_message *msg, const char *attribute,
                        int *num_values, DATA_BLOB **values)

diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 3ddf4f2dc0f1d65a8a0f1851e5a5de2e99389c82..a01d94e287ab2e076825e4442ee84de090efd263 100644 (file)
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -18,6 +18,8 @@
 */
 
 #include "includes.h"
+#include "tldap.h"
+#include "tldap_util.h"
 
 struct pdb_ads_state {
        struct sockaddr_un socket_address;