From 6dc924fcf3d994e4566d9aab8e5b1b58912ac567 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 23 Dec 2009 11:48:33 +0100 Subject: s3: Remove some unused code --- source3/winbindd/winbindd.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'source3/winbindd/winbindd.h') diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h index 2e7d09f442..e58230225b 100644 --- a/source3/winbindd/winbindd.h +++ b/source3/winbindd/winbindd.h @@ -121,8 +121,6 @@ struct winbindd_cm_conn { struct rpc_pipe_client *netlogon_pipe; }; -struct winbindd_async_request; - /* Async child */ struct winbindd_domain; -- cgit From 03617df24d14f928d445018038ba222cd75ca63e Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 24 Dec 2009 12:52:00 +0100 Subject: s3: winbindd_cli_state->getgrent_state is no longer used --- source3/winbindd/winbindd.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'source3/winbindd/winbindd.h') diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h index e58230225b..99fa10250a 100644 --- a/source3/winbindd/winbindd.h +++ b/source3/winbindd/winbindd.h @@ -65,22 +65,11 @@ struct winbindd_cli_state { * initialized? */ bool getgrent_initialized; /* Has getgrent_state been * initialized? */ - struct getent_state *getgrent_state; /* State for getgrent() */ struct getpwent_state *pwent_state; /* State for getpwent() */ struct getgrent_state *grent_state; /* State for getgrent() */ }; -/* State between get{pw,gr}ent() calls */ - -struct getent_state { - struct getent_state *prev, *next; - void *sam_entries; - uint32 sam_entry_index, num_sam_entries; - bool got_sam_entries; - fstring domain_name; -}; - struct getpwent_state { struct winbindd_domain *domain; int next_user; -- cgit From 634d084517652a053587a2f13825a49a67460f12 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 24 Dec 2009 12:52:24 +0100 Subject: s3: Replace IS_DOMAIN_OFFLINE by a function --- source3/winbindd/winbindd.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source3/winbindd/winbindd.h') diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h index 99fa10250a..a589ecc0cc 100644 --- a/source3/winbindd/winbindd.h +++ b/source3/winbindd/winbindd.h @@ -387,9 +387,4 @@ struct WINBINDD_CCACHE_ENTRY { #define WINBINDD_PAM_AUTH_KRB5_RENEW_TIME 2592000 /* one month */ #define DOM_SEQUENCE_NONE ((uint32)-1) -#define IS_DOMAIN_OFFLINE(x) ( lp_winbind_offline_logon() && \ - ( get_global_winbindd_state_offline() \ - || !(x)->online ) ) -#define IS_DOMAIN_ONLINE(x) (!IS_DOMAIN_OFFLINE(x)) - #endif /* _WINBINDD_H */ -- cgit From b8fcba9cb8f508ffd97f00179dafa4537342c9c0 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 28 Dec 2009 15:51:36 +0100 Subject: s3: Pass netr_DomainTrustList instead of names and sids through (*trusted_domains) --- source3/winbindd/winbindd.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source3/winbindd/winbindd.h') diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h index a589ecc0cc..ea791234fb 100644 --- a/source3/winbindd/winbindd.h +++ b/source3/winbindd/winbindd.h @@ -313,10 +313,7 @@ struct winbindd_methods { /* enumerate trusted domains */ NTSTATUS (*trusted_domains)(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - uint32 *num_domains, - char ***names, - char ***alt_names, - DOM_SID **dom_sids); + struct netr_DomainTrustList *trusts); }; /* Filled out by IDMAP backends */ -- cgit