diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-24 03:15:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:14:39 -0500 |
| commit | 78f2900a1691ab03820cfa0b7876518d7c101945 (patch) | |
| tree | 9e5420e589e5492506b241c2706c309b5de05bfa | |
| parent | 3cf367f0e76f44c7b14a54e0fcf510cc79a15c6a (diff) | |
| download | samba-78f2900a1691ab03820cfa0b7876518d7c101945.tar.gz samba-78f2900a1691ab03820cfa0b7876518d7c101945.tar.bz2 samba-78f2900a1691ab03820cfa0b7876518d7c101945.zip | |
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)
| -rw-r--r-- | source3/Makefile.in | 3 | ||||
| -rw-r--r-- | source3/include/ads_protos.h | 6 | ||||
| -rw-r--r-- | source3/libads/gpo.c | 10 |
3 files changed, 13 insertions, 6 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 1a4c63df0a..cc2c355f1c 100644 --- 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 a566714d62..b5f323774d 100644 --- 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 1d5cdfa026..84898ab387 100644 --- 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); |