[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1204-g13911af

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  13911afe5b167ae9d100c40d32e9286d902652a1 (commit)
      from  e4a26c94271409d58138391d523305d641105a05 (commit)

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


- Log -----------------------------------------------------------------
commit 13911afe5b167ae9d100c40d32e9286d902652a1
Author: Bo Yang <boyang at samba.org>
Date:   Fri Aug 7 13:55:31 2009 +0800

    s3: Unable to browse DFS when using kerberos in libsmbclient
    
    Signed-off-by: Bo Yang <boyang at samba.org>
    
    Fixes bug #6615.

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

Summary of changes:
 source3/libsmb/libsmb_context.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index f09e9c6..f85f2df 100644
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -651,22 +651,28 @@ void smbc_set_credentials_with_fallback(SMBCCTX *context,
 {
 	smbc_bool use_kerberos = false;
 	const char *signing_state = "off";
-	struct user_auth_info *auth_info = user_auth_info_init(NULL);
+	struct user_auth_info *auth_info = NULL;
 
-	if (auth_info) {
+	if (! context) {
+
+		return;
+	}
+
+	if (! workgroup || ! *workgroup) {
+		workgroup = smbc_getWorkgroup(context);
 	}
 
-	if (! context ||
-	    ! workgroup || ! *workgroup ||
-	    ! user || ! *user ||
-	    ! password || ! *password) {
+	if (! user) {
+		user = smbc_getUser(context);
+	}
 
-		return;
+	if (! password) {
+		password = "";
 	}
 
 	auth_info = user_auth_info_init(NULL);
 
-	if (auth_info) {
+	if (! auth_info) {
 		DEBUG(0, ("smbc_set_credentials_with_fallback: allocation fail\n"));
 		return;
 	}


-- 
Samba Shared Repository