summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-02-24 22:25:19 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-02-24 22:25:19 +0000
commitc5871a1893ccaf81116defcdc20d644502e2f98c (patch)
treea61910f3c1ad003f77e15b5cb8a05b0fe01c7f4f
parent79aaa35ea5e8c74ff7755ec650aca88cc7e4cf7e (diff)
downloadsamba-c5871a1893ccaf81116defcdc20d644502e2f98c.tar.gz
samba-c5871a1893ccaf81116defcdc20d644502e2f98c.tar.bz2
samba-c5871a1893ccaf81116defcdc20d644502e2f98c.zip
Whenever we have a password, use the in-memory ccache. This fixes a bug where
we were overwriting the user's ccache with the machine password (the -P option). Andrew Bartlett (This used to be commit 231d2f84ef36b30be98baf3b56ebf4a5cd8dad11)
-rw-r--r--source3/utils/net_ads.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 75bb29f213..bb87879044 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -131,7 +131,6 @@ static ADS_STRUCT *ads_startup(void)
if (opt_user_specified) {
need_password = True;
- use_in_memory_ccache();
}
retry:
@@ -142,8 +141,10 @@ retry:
free(prompt);
}
- if (opt_password)
+ if (opt_password) {
+ use_in_memory_ccache();
ads->auth.password = strdup(opt_password);
+ }
ads->auth.user_name = strdup(opt_user_name);