[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  d50829a s3: Remove some unused code
      from  fcb7729 wintest: the start of a S3 testing script for wintest

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d50829a812403ccd17f65cdf0b53c90e86b6b5bd
Author: Volker Lendecke <v...@samba.org>
Date:   Fri Nov 19 10:35:04 2010 +0100

    s3: Remove some unused code
    
    Autobuild-User: Volker Lendecke <vlen...@samba.org>
    Autobuild-Date: Fri Nov 19 11:21:00 CET 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/winbindd_proto.h |    1 -
 source3/winbindd/winbindd_util.c  |   43 -------------------------------------
 2 files changed, 0 insertions(+), 44 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_proto.h 
b/source3/winbindd/winbindd_proto.h
index dc56a72..9ddfe87 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 afdce47..e27c35f 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
  *


-- 
Samba Shared Repository