r18869: two build fixes for systems without ldap

the first is to not enable the ldap ldb backend just yet. This will
need configure tests to conditionally include. We should be able to
use the m4 files from lib/ldb/

The 2nd is to fix libads/gpo.o not to publicly prototype a function
that needs ldap.h
(This used to be commit 1cf17edc14ebd379b982b589a66e86316ef7087b)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1a4c63df0a1a93ddbfae4b1c6d6dd71a2a4f59cc..cc2c355f1c0134617b284b6da7479cf1952a8b0c 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -789,7 +789,8 @@ LDB_MODULES_OBJ=lib/ldb/modules/operational.o lib/ldb/modules/schema.o lib/ldb/m
           lib/ldb/modules/objectclass.o \
           lib/ldb/modules/paged_results.o lib/ldb/modules/sort.o lib/ldb/modules/asq.o
 
-LDB_LDAP_OBJ=lib/ldb/ldb_ldap/ldb_ldap.o
+# disabled until build issues sorted out
+# LDB_LDAP_OBJ=lib/ldb/ldb_ldap/ldb_ldap.o
 
 LDB_OBJ = ${LDB_COMMON_OBJ} ${LDB_TDB_OBJ} ${LDB_LDAP_OBJ} ${LDB_MODULES_OBJ}
 

diff --git a/source3/include/ads_protos.h b/source3/include/ads_protos.h
index a566714d629bf04594bede8579e138f318194cbe..b5f323774d34371acfaf2ec9cfb7d97bb0f3a08c 100644 (file)
--- a/source3/include/ads_protos.h
+++ b/source3/include/ads_protos.h
@@ -87,3 +87,9 @@ void ads_process_results(ADS_STRUCT *ads, LDAPMessage *res,
                         BOOL(*fn)(char *, void **, void *),
                         void *data_area);
 void ads_dump(ADS_STRUCT *ads, LDAPMessage *res);
+
+ADS_STATUS ads_parse_gpo(ADS_STRUCT *ads,
+                        TALLOC_CTX *mem_ctx,
+                        LDAPMessage *res,
+                        const char *gpo_dn,
+                        struct GROUP_POLICY_OBJECT *gpo);

diff --git a/source3/libads/gpo.c b/source3/libads/gpo.c
index 1d5cdfa0268bbfaf5bd762f52da3a363dbceb3ae..84898ab38718940ed5acea53465c853b3db66356 100644 (file)
--- a/source3/libads/gpo.c
+++ b/source3/libads/gpo.c
@@ -362,11 +362,11 @@ ADS_STATUS ads_delete_gpo_link(ADS_STRUCT *ads,
        return ads_gen_mod(ads, link_dn, mods); 
 }
 
-ADS_STATUS ads_parse_gpo(ADS_STRUCT *ads,
-                        TALLOC_CTX *mem_ctx,
-                        LDAPMessage *res,
-                        const char *gpo_dn,
-                        struct GROUP_POLICY_OBJECT *gpo)
+ ADS_STATUS ads_parse_gpo(ADS_STRUCT *ads,
+                         TALLOC_CTX *mem_ctx,
+                         LDAPMessage *res,
+                         const char *gpo_dn,
+                         struct GROUP_POLICY_OBJECT *gpo)
 {
        ZERO_STRUCTP(gpo);