Missed a couple of files from the client-side kerberos merge

(This used to be commit 56934f303c0551df858cc6d6ad32d0b37fcd1307)

1 files changed, 14 insertions, 2 deletions

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 867252c95f..75bb29f213 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -110,6 +110,11 @@ static int net_ads_info(int argc, const char **argv)
 	return 0;
 }
 
+static void use_in_memory_ccache(void) {
+	/* Use in-memory credentials cache so we do not interfere with
+	 * existing credentials */
+	setenv(KRB5_ENV_CCNAME, "MEMORY:net_ads", 1);
+}
 
 static ADS_STRUCT *ads_startup(void)
 {
@@ -124,8 +129,10 @@ static ADS_STRUCT *ads_startup(void)
 		opt_user_name = "administrator";
 	}
 
-	if (opt_user_specified)
+	if (opt_user_specified) {
 		need_password = True;
+		use_in_memory_ccache();
+	}
 
 retry:
 	if (!opt_password && need_password) {
@@ -601,6 +608,8 @@ static int net_ads_join_ok(void)
  */
 int net_ads_testjoin(int argc, const char **argv)
 {
+	use_in_memory_ccache();
+
 	/* Display success or failure */
 	if (net_ads_join_ok() != 0) {
 		fprintf(stderr,"Join to domain is not valid\n");
@@ -878,7 +887,8 @@ static int net_ads_password(int argc, const char **argv)
 	(strchr(argv[0], '@') == NULL)) {
 	return net_ads_usage(argc, argv);
     }
-    
+
+    use_in_memory_ccache();    
     c = strchr(auth_principal, '@');
     realm = ++c;
 
@@ -925,6 +935,8 @@ static int net_ads_change_localhost_pass(int argc, const char **argv)
 
     opt_password = secrets_fetch_machine_password();
 
+    use_in_memory_ccache();
+
     if (!(ads = ads_startup())) {
 	    return -1;
     }