From: Günther Deschner <gd@samba.org>
Date: Wed, 13 May 2009 21:57:26 +0000 (+0200)
Subject: s3-netapi: Fix Bug #6305. Correctly prompt for a password when a username was given.
X-Git-Tag: samba-4.0.0alpha8~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33be1f56f778116a5657b257ffb0f1eb7196658a;p=thirdparty%2Fsamba.git

s3-netapi: Fix Bug #6305. Correctly prompt for a password when a username was given.

When no callback or wrapping has managed to get a password, prompt in the
netapi connection manager for a password.

Guenther
---

diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index d28b2b21263..55f5350821b 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -42,8 +42,12 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
 	}
 	auth_info->signing_state = Undefined;
 	set_cmdline_auth_info_use_kerberos(auth_info, ctx->use_kerberos);
-	set_cmdline_auth_info_password(auth_info, ctx->password);
 	set_cmdline_auth_info_username(auth_info, ctx->username);
+	if (ctx->password) {
+		set_cmdline_auth_info_password(auth_info, ctx->password);
+	} else {
+		set_cmdline_auth_info_getpass(auth_info);
+	}
 
 	if (ctx->username && ctx->username[0] &&
 	    ctx->password && ctx->password[0] &&