The branch, v3-4-test has been updated
via 601520bf618555d7ef04f5586956b53a37594bff (commit)
from 39b97a9826847e4336c35d8a2d02be2d64334e76 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 601520bf618555d7ef04f5586956b53a37594bff
Author: Günther Deschner <g...@samba.org>
Date: Wed May 13 23:57:26 2009 +0200
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
(cherry picked from commit 33be1f56f778116a5657b257ffb0f1eb7196658a)
-----------------------------------------------------------------------
Summary of changes:
source3/lib/netapi/cm.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index d28b2b2..55f5350 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] &&
--
Samba Shared Repository
