From d50829a812403ccd17f65cdf0b53c90e86b6b5bd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 19 Nov 2010 10:35:04 +0100 Subject: s3: Remove some unused code Autobuild-User: Volker Lendecke Autobuild-Date: Fri Nov 19 11:21:00 CET 2010 on sn-devel-104 --- source3/winbindd/winbindd_proto.h | 1 - source3/winbindd/winbindd_util.c | 43 --------------------------------------- 2 files changed, 44 deletions(-) (limited to 'source3') diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index dc56a72152..9ddfe87480 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -369,7 +369,6 @@ void rescan_trusted_domains(struct tevent_context *ev, struct tevent_timer *te, enum winbindd_result winbindd_dual_init_connection(struct winbindd_domain *domain, struct winbindd_cli_state *state); bool init_domain_list(void); -void check_domain_trusted( const char *name, const struct dom_sid *user_sid ); struct winbindd_domain *find_domain_from_name_noinit(const char *domain_name); struct winbindd_domain *find_domain_from_name(const char *domain_name); struct winbindd_domain *find_domain_from_sid_noinit(const struct dom_sid *sid); diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index afdce47d2d..e27c35fe60 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -643,49 +643,6 @@ bool init_domain_list(void) return True; } -void check_domain_trusted( const char *name, const struct dom_sid *user_sid ) -{ - struct winbindd_domain *domain; - struct dom_sid dom_sid; - uint32 rid; - - /* Check if we even care */ - - if (!lp_allow_trusted_domains()) - return; - - domain = find_domain_from_name_noinit( name ); - if ( domain ) - return; - - sid_copy( &dom_sid, user_sid ); - if ( !sid_split_rid( &dom_sid, &rid ) ) - return; - - /* add the newly discovered trusted domain */ - - domain = add_trusted_domain( name, NULL, &cache_methods, - &dom_sid); - - if ( !domain ) - return; - - /* assume this is a trust from a one-way transitive - forest trust */ - - domain->active_directory = True; - domain->domain_flags = NETR_TRUST_FLAG_OUTBOUND; - domain->domain_type = NETR_TRUST_TYPE_UPLEVEL; - domain->internal = False; - domain->online = True; - - setup_domain_child(domain); - - wcache_tdc_add_domain( domain ); - - return; -} - /** * Given a domain name, return the struct winbindd domain info for it * -- cgit