[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5339-g40da23b

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  40da23b6a7dc7acfbdf76a6808b7e50c6c39093e (commit)
      from  2538df1ea3229ea6d8242b5ae6fdd3d453395609 (commit)

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


- Log -----------------------------------------------------------------
commit 40da23b6a7dc7acfbdf76a6808b7e50c6c39093e
Author: Bo Yang <boyang at samba.org>
Date:   Fri Aug 7 14:58:36 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:
 source/libsmb/libsmb_context.c |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/libsmb_context.c b/source/libsmb/libsmb_context.c
index ec16311..8e0aa1e 100644
--- a/source/libsmb/libsmb_context.c
+++ b/source/libsmb/libsmb_context.c
@@ -655,14 +655,23 @@ void smbc_set_credentials_with_fallback(SMBCCTX *context,
 	smbc_bool use_kerberos = false;
 	const char *signing_state = "off";
 	
-	if (!context ||
-	    ! workgroup || ! *workgroup ||
-	    ! user || ! *user ||
-	    ! password || ! *password) {
+	if (! context) {
 	    
 		return;
 	}
 
+	if (! workgroup || ! *workgroup) {
+		workgroup = smbc_getWorkgroup(context);
+	}
+
+	if (! user) {
+		user = smbc_getUser(context);
+	}
+
+	if (! password) {
+		password = "";
+	}
+
 	if (smbc_getOptionUseKerberos(context)) {
 		use_kerberos = True;
 	}


-- 
Samba Shared Repository