[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-699-gc789d04

[Günther Deschner]

The branch, master has been updated
       via  c789d041f0e7946a3c07a5ed8d70e5cb462d1773 (commit)
       via  4b01e378d2a1a7e5e93573878fcdc05907e9a5bd (commit)
      from  60433b154dc345f8883b15d657e3f7d5c21fc6a1 (commit)

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


- Log -----------------------------------------------------------------
commit c789d041f0e7946a3c07a5ed8d70e5cb462d1773
Author: Günther Deschner <g...@samba.org>
Date:   Thu Sep 24 18:20:50 2009 +0200

    s3-winbindd: no reason to call winbindd_can_contact_domain() three times in 
query_user().
    
    Guenther

commit 4b01e378d2a1a7e5e93573878fcdc05907e9a5bd
Author: Günther Deschner <g...@samba.org>
Date:   Thu Sep 24 18:20:13 2009 +0200

    s3: remove unused printing macros.
    
    Guenther

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

Summary of changes:
 source3/include/ntdomain.h      |   11 -----------
 source3/winbindd/winbindd_rpc.c |   12 ------------
 2 files changed, 0 insertions(+), 23 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index f904782..bbe653b 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -241,15 +241,4 @@ struct api_struct {
        bool (*fn) (pipes_struct *);
 };
 
-/*
- * higher order functions for use with msrpc client code
- */
-
-#define PRINT_INFO_FN(fn)\
-        void (*fn)(const char*, uint32, uint32, void  *const *const)
-#define JOB_INFO_FN(fn)\
-        void (*fn)(const char*, const char*, uint32, uint32, void *const 
*const)
-
-/* end higher order functions */
-
 #endif /* _NT_DOMAIN_H */
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 82e782b..ac5c3d2 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -493,18 +493,6 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
                return NT_STATUS_OK;
        }
 
-       if ( !winbindd_can_contact_domain( domain ) ) {
-               DEBUG(10,("query_user: No incoming trust for domain %s\n",
-                         domain->name));
-               return NT_STATUS_OK;
-       }
-
-       if ( !winbindd_can_contact_domain( domain ) ) {
-               DEBUG(10,("query_user: No incoming trust for domain %s\n",
-                         domain->name));
-               return NT_STATUS_OK;
-       }
-
        /* no cache; hit the wire */
 
        result = cm_connect_sam(domain, mem_ctx, &cli, &dom_pol);


-- 
Samba Shared Repository