summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-12-11 08:52:20 +0100
committerMichael Adam <obnox@samba.org>2007-12-13 10:15:14 +0100
commit4884f5d23af41a0b88b98a0485cb3935beb820fe (patch)
treeef238cb2f94d38be9cf935caadbebfeb069b173f
parentb99a6b0e8c3ca57666c16a9228337338033df1c1 (diff)
downloadsamba-4884f5d23af41a0b88b98a0485cb3935beb820fe.tar.gz
samba-4884f5d23af41a0b88b98a0485cb3935beb820fe.tar.bz2
samba-4884f5d23af41a0b88b98a0485cb3935beb820fe.zip
In cm_prepare_connection(), only get auth user creds if we need to.
Michael (This used to be commit 164bfb25d7b5cfeffeb4d81958b7629a11ca5d5e)
-rw-r--r--source3/winbindd/winbindd_cm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 3f6544965d..0a96e04052 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -676,8 +676,6 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
return NT_STATUS_NO_MEMORY;
}
- cm_get_ipc_userpass(&ipc_username, &ipc_domain, &ipc_password);
-
*retry = True;
got_mutex = secrets_named_mutex(controller,
@@ -795,6 +793,8 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
(*cli)->use_kerberos = False;
+ cm_get_ipc_userpass(&ipc_username, &ipc_domain, &ipc_password);
+
if ((((*cli)->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) != 0) &&
(strlen(ipc_username) > 0)) {