[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-703-g7c9fa59

[Michael Adam]

The branch, v3-2-test has been updated
       via  7c9fa597d684a25822b4db6615f28336f2d64ef3 (commit)
      from  0a9874c1c76c0ccc71caba7ee85a0ee1a91808c5 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 7c9fa597d684a25822b4db6615f28336f2d64ef3
Author: Michael Adam <obnox at samba.org>
Date:   Tue Dec 18 01:55:48 2007 +0100

    Fix logic error in cm_connect_sam().
    
    Don't fall back to schannel when trust creds could be obtained.
    This is still not complete, but I am getting closer.
    
    Michael

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

Summary of changes:
 source/winbindd/winbindd_cm.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
index 6c5633c..8ea8155 100644
--- a/source/winbindd/winbindd_cm.c
+++ b/source/winbindd/winbindd_cm.c
@@ -2003,7 +2003,6 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
 			goto schannel;
 		}
 		domain_name = domain->name;
-		goto schannel;
 	} else {
 		machine_password = SMB_STRDUP(conn_pwd);		
 		machine_account = SMB_STRDUP(conn->cli->user_name);


-- 
Samba Shared Repository