diff options
| author | Günther Deschner <gd@samba.org> | 2009-04-27 14:39:02 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-04-28 17:53:35 +0200 |
| commit | bec6191ffa9ed1d860001689b8f46bd785ed932b (patch) | |
| tree | d6860846fe3d8c8f4e8dde003f8bc4f5812717fe | |
| parent | 035f4efa9943e4b9cb3ecbc239e3fa579a5cfdd2 (diff) | |
| download | samba-bec6191ffa9ed1d860001689b8f46bd785ed932b.tar.gz | |
s3-net: make sure to call libnetapi init functions at the top of "net rpc" command.
Without the initialization "net rpc password" will prompt twice for passwords
and will not allow to define the name of the connection admin user.
In the long run we should probably only have one place where to initialize
libnetapi.
Kai, please check.
Guenther
(cherry picked from commit 09ec85715b0e99740156ebb7213eddd1edfea631)
(cherry picked from commit 0c5f19fbea7a6419a84ac0137a9a09995ef7a933)
| -rw-r--r-- | source3/utils/net_rpc.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index d100189bfcc..d347bd854c9 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -7001,6 +7001,8 @@ int net_rpc_printer(struct net_context *c, int argc, const char **argv) int net_rpc(struct net_context *c, int argc, const char **argv) { + NET_API_STATUS status; + struct functable func[] = { { "audit", @@ -7181,5 +7183,16 @@ int net_rpc(struct net_context *c, int argc, const char **argv) }, {NULL, NULL, 0, NULL, NULL} }; + + status = libnetapi_init(&c->netapi_ctx); + if (status != 0) { + return -1; + } + 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); + } + return net_run_function(c, argc, argv, "net rpc", func); } |