[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2189-g38cd0e0

[Kai Blin]

The branch, master has been updated
       via  38cd0e086f50ce54d88a19aa5a6803469af90489 (commit)
      from  ba42cccf008bfeb2bb4621fef7882bd3077dfe41 (commit)

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


- Log -----------------------------------------------------------------
commit 38cd0e086f50ce54d88a19aa5a6803469af90489
Author: Kai Blin <kai at samba.org>
Date:   Tue Jun 9 18:05:50 2009 +0200

    net: Only use the in memory ccache when not already using a kerberos ticket in net ads

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

Summary of changes:
 source3/utils/net_ads.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 588f57f..38b59d9 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -236,7 +236,8 @@ retry:
 		set_cmdline_auth_info_getpass(c->auth_info);
 	}
 
-	if (get_cmdline_auth_info_got_pass(c->auth_info)) {
+	if (get_cmdline_auth_info_got_pass(c->auth_info) ||
+	    !get_cmdline_auth_info_use_kerberos(c->auth_info)) {
 		use_in_memory_ccache();
 		SAFE_FREE(ads->auth.password);
 		ads->auth.password = smb_xstrdup(


-- 
Samba Shared Repository