svn commit: samba r18869 - in branches/SAMBA_3_0/source: . include libads

[tridge at samba.org]

Author: tridge
Date: 2006-09-24 03:15:58 +0000 (Sun, 24 Sep 2006)
New Revision: 18869

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18869

Log:

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

Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0/source/include/ads_protos.h
   branches/SAMBA_3_0/source/libads/gpo.c


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2006-09-24 02:58:58 UTC (rev 18868)
+++ branches/SAMBA_3_0/source/Makefile.in	2006-09-24 03:15:58 UTC (rev 18869)
@@ -789,7 +789,8 @@
           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}
 

Modified: branches/SAMBA_3_0/source/include/ads_protos.h
===================================================================
--- branches/SAMBA_3_0/source/include/ads_protos.h	2006-09-24 02:58:58 UTC (rev 18868)
+++ branches/SAMBA_3_0/source/include/ads_protos.h	2006-09-24 03:15:58 UTC (rev 18869)
@@ -87,3 +87,9 @@
 			 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);

Modified: branches/SAMBA_3_0/source/libads/gpo.c
===================================================================
--- branches/SAMBA_3_0/source/libads/gpo.c	2006-09-24 02:58:58 UTC (rev 18868)
+++ branches/SAMBA_3_0/source/libads/gpo.c	2006-09-24 03:15:58 UTC (rev 18869)
@@ -362,11 +362,11 @@
 	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);