[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  92e8fd0 s3: Call sid_check_is_domain instead of dom_sid_equal
       via  e25ee6a s3: Make winbind recover from a signing error
      from  92d87e1 s3/vfs_tsmsm: remove unneeded cast to off_t

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


- Log -----------------------------------------------------------------
commit 92e8fd0513e0b7dd3523c1c5cab066231a38470d
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 18 15:20:38 2010 +0100

    s3: Call sid_check_is_domain instead of dom_sid_equal
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Thu Nov 18 15:32:32 UTC 2010 on sn-devel-104

commit e25ee6af8f783c82af6e5b0f12ec19467deabb8a
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 18 13:28:47 2010 +0100

    s3: Make winbind recover from a signing error
    
    When winbind sees a signing error on the smb connection to a DC (for whatever
    reason, our bug, network glitch, etc) it should recover properly. The "old"
    code in clientgen.c just closed the socket in this case. This is the right
    thing to do, this connection is spoiled anyway. The new, async code did not do
    this so far, which led to the code in winbindd_cm.c not detect that we need to
    reconnect.

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

Summary of changes:
 source3/libsmb/async_smb.c        |    2 ++
 source3/winbindd/winbindd_cache.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 0aaeea2..b04c274 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -702,6 +702,8 @@ static void cli_smb_received(struct tevent_req *subreq)
 		DEBUG(10, ("cli_check_sign_mac failed\n"));
 		TALLOC_FREE(inbuf);
 		status = NT_STATUS_ACCESS_DENIED;
+		close(cli->fd);
+		cli->fd = -1;
 		goto fail;
 	}
 
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 9363a70..c0f44db 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -120,7 +120,7 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain)
 	}
 
 	if (strequal(domain->name, get_global_sam_name()) &&
-	    dom_sid_equal(&domain->sid, get_global_sam_sid())) {
+	    sid_check_is_domain(&domain->sid)) {
 		domain->backend = &sam_passdb_methods;
 		domain->initialized = True;
 	}


-- 
Samba Shared Repository