From 70da79f8a8abf615ce0bb938853e31192c079534 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 6 Jun 2003 20:31:19 +0000
Subject: fix build on systems w/o LDAP libs (This used to be commit
 f33aeaa039d49b4eef884b27dc81d3418a051f1a)

---
 source3/Makefile.in       |  2 +-
 source3/include/smbldap.h | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index df74ea4551..5db9734bef 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -559,7 +559,7 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) \
 	    $(LIB_SMBD_OBJ) $(SAM_OBJ) $(REGISTRY_OBJ) $(POPT_LIB_OBJ) \
 	    $(RPC_LSA_OBJ) $(RPC_NETLOG_OBJ) $(RPC_SAMR_OBJ) $(RPC_REG_OBJ) \
 	    $(RPC_SVC_OBJ) $(RPC_WKS_OBJ) $(RPC_DFS_OBJ) $(RPC_SPOOLSS_OBJ) \
-	    $(IDMAP_OBJ) $(RPC_ECHO_OBJ) $(SMBLDAP_OBJ)
+	    $(IDMAP_OBJ) $(RPC_ECHO_OBJ) 
 
 NSS_OBJ_0 = nsswitch/wins.o $(PARAM_OBJ) $(UBIQX_OBJ) $(LIBSMB_OBJ) \
 	    $(LIB_OBJ) $(NSSWINS_OBJ)
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
index c669f77425..987206b450 100644
--- a/source3/include/smbldap.h
+++ b/source3/include/smbldap.h
@@ -19,6 +19,8 @@
    
 */
 
+#ifdef HAVE_LDAP
+
 #ifndef _SMBLDAP_H
 #define _SMBLDAP_H
 
@@ -100,4 +102,16 @@ extern ATTRIB_MAP_ENTRY groupmap_attr_list_to_delete[];
 extern ATTRIB_MAP_ENTRY idpool_attr_list[];
 extern ATTRIB_MAP_ENTRY sidmap_attr_list[];
 
+/* Function declarations -- not included in proto.h so we don't
+   have to worry about LDAP structure types */
+
+const char* get_attr_key2string( ATTRIB_MAP_ENTRY table[], int key );
+char** get_attr_list( ATTRIB_MAP_ENTRY table[] );
+void free_attr_list( char **list );
+BOOL fetch_ldap_pw(char **dn, char** pw);
+void ldap_set_mod (LDAPMod *** modlist, int modop, const char *attribute, const char *value);
+
+
 #endif	/* _SMBLDAP_H */
+
+#endif 	/* HAVE_LDAP */
-- 
cgit