The branch, master has been updated
via bf38287 s3-winbindd: another attempt to fix the non-ldap build.
from 2d67730 s3:registry: move regio.h from include/ to registry/
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bf38287c76f90593d5a7eeb9889e12b3bea54adf
Author: Günther Deschner <[email protected]>
Date: Tue Sep 21 00:18:27 2010 -0700
s3-winbindd: another attempt to fix the non-ldap build.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/winbindd_cache.c | 3 +++
source3/winbindd/winbindd_proto.h | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_cache.c
b/source3/winbindd/winbindd_cache.c
index c2ce0a2..f7ab726 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -4550,6 +4550,8 @@ static void wcache_save_user_pwinfo(struct
winbindd_domain *domain,
centry_free(centry);
}
+#ifdef HAVE_ADS
+
NTSTATUS nss_get_info_cached( struct winbindd_domain *domain,
const struct dom_sid *user_sid,
TALLOC_CTX *ctx,
@@ -4609,6 +4611,7 @@ do_query:
return nt_status;
}
+#endif
/* the cache backend methods are exposed via this structure */
struct winbindd_methods cache_methods = {
diff --git a/source3/winbindd/winbindd_proto.h
b/source3/winbindd/winbindd_proto.h
index f43c08f..fa3cc10 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -152,6 +152,7 @@ bool wcache_tdc_fetch_list( struct winbindd_tdc_domain
**domains, size_t *num_do
bool wcache_tdc_add_domain( struct winbindd_domain *domain );
struct winbindd_tdc_domain * wcache_tdc_fetch_domain( TALLOC_CTX *ctx, const
char *name );
void wcache_tdc_clear( void );
+#ifdef HAVE_ADS
struct ads_struct;
NTSTATUS nss_get_info_cached( struct winbindd_domain *domain,
const struct dom_sid *user_sid,
@@ -159,6 +160,7 @@ NTSTATUS nss_get_info_cached( struct winbindd_domain
*domain,
struct ads_struct *ads, LDAPMessage *msg,
const char **homedir, const char **shell,
const char **gecos, gid_t *p_gid);
+#endif
bool wcache_store_seqnum(const char *domain_name, uint32_t seqnum,
time_t last_seq_check);
bool wcache_fetch_ndr(TALLOC_CTX *mem_ctx, struct winbindd_domain *domain,
--
Samba Shared Repository
