From a31f10c99edd7cb80d62d377c8efead5a4846b40 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 24 Jan 2007 14:39:46 +0000
Subject: r21001: * Use a simple '#define LDAPMessage void' to fix the build  
 problems in the nss_info interface when HAVE_LDAP is undefined. * Revert
 previous ifdef HAVE_ADS brakets * Remove an unused init function wrapper.
 (This used to be commit 2ba353848b6d8d36520e7fd82576653a39c602cd)

---
 source3/include/includes.h |  3 ---
 source3/include/nss_info.h | 12 ++++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'source3/include')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index da390c87ea..84bd90cc27 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -777,9 +777,6 @@ enum flush_reason_enum {
 
 #ifdef HAVE_LDAP
 #include "ads_protos.h"
-#else
-struct _LDAPMessage;
-typedef struct _LDAPMessage *LDAPMessage;
 #endif
 
 /* We need this after proto.h to reference GetTimeOfDay(). */
diff --git a/source3/include/nss_info.h b/source3/include/nss_info.h
index 2d7a5682e2..50e5e8182a 100644
--- a/source3/include/nss_info.h
+++ b/source3/include/nss_info.h
@@ -20,11 +20,15 @@
    Boston, MA  02111-1307, USA.   
 */
 
-#ifdef WITH_ADS
-
 #ifndef _IDMAP_NSS_H
 #define _IDMAP_NSS_H
 
+#ifndef HAVE_LDAP
+#  ifndef LDAPMessage
+#    define LDAPMessage void
+#  endif
+#endif
+
 /* The interface version specifier */
 
 #define SMB_NSS_INFO_INTERFACE_VERSION	  1
@@ -84,9 +88,5 @@ NTSTATUS nss_get_info( const char *domain, const DOM_SID *user_sid,
 
 NTSTATUS nss_close( const char *parameters );
 
-NTSTATUS idmap_nss_init_domain( const char *domain );
-
-
 #endif /* _IDMAP_NSS_H_ */
 
-#endif /* WITH_ADS */
-- 
cgit