summaryrefslogtreecommitdiffstats
path: root/source3/utils/net_rpc_shell.c
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2009-07-05 09:21:07 +0200
committerKai Blin <kai@samba.org>2009-07-22 13:39:34 +0200
commit8f5ef1063354b4ce32dfc9122e8221e2fea88890 (patch)
tree43f4b7d4fa6e3c00f602421471e9c320bf75578a /source3/utils/net_rpc_shell.c
parent1887ad0a26cca026c3503f0ef4e40f8eff42a121 (diff)
downloadsamba-8f5ef1063354b4ce32dfc9122e8221e2fea88890.tar.gz
samba-8f5ef1063354b4ce32dfc9122e8221e2fea88890.tar.xz
samba-8f5ef1063354b4ce32dfc9122e8221e2fea88890.zip
Revert "net: Use samba default command line arguments."
This reverts commit fb262f79fab00374023e59476e8d05a1015a7041 and related commits c36031778e1983ddb11d3e1fcab35e738dbf94bc 72fd5fa6bb78a054fad5e5ebe19a0c0387a7d45b and 38cd0e086f50ce54d88a19aa5a6803469af90489 This change caused more trouble than it solved. We need to do this differently. Reverting so we don't accidently release this.
Diffstat (limited to 'source3/utils/net_rpc_shell.c')
-rw-r--r--source3/utils/net_rpc_shell.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c
index dc13e914238..3aaed1ed181 100644
--- a/source3/utils/net_rpc_shell.c
+++ b/source3/utils/net_rpc_shell.c
@@ -220,12 +220,9 @@ int net_rpc_shell(struct net_context *c, int argc, const char **argv)
if (libnetapi_init(&c->netapi_ctx) != 0) {
return -1;
}
- set_cmdline_auth_info_getpass(c->auth_info);
- libnetapi_set_username(c->netapi_ctx,
- get_cmdline_auth_info_username(c->auth_info));
- libnetapi_set_password(c->netapi_ctx,
- get_cmdline_auth_info_password(c->auth_info));
- if (get_cmdline_auth_info_use_kerberos(c->auth_info)) {
+ libnetapi_set_username(c->netapi_ctx, c->opt_user_name);
+ libnetapi_set_password(c->netapi_ctx, c->opt_password);
+ if (c->opt_kerberos) {
libnetapi_set_use_kerberos(c->netapi_ctx);
}