From: Kai Blin <kai@samba.org>
Date: Tue, 9 Jun 2009 16:05:50 +0000 (+0200)
Subject: net: Only use the in memory ccache when not already using a kerberos ticket in net ads
X-Git-Tag: tdb-1.1.5~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38cd0e086f50ce54d88a19aa5a6803469af90489;p=thirdparty%2Fsamba.git

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

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 588f57f030d..38b59d9cdfd 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(