From: Günther Deschner <gd@samba.org>
Date: Mon, 27 Apr 2009 12:39:02 +0000 (+0200)
Subject: s3-net: make sure to call libnetapi init functions at the top of "net rpc" command.
X-Git-Tag: tdb-1.1.5~875
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09ec85715b0e99740156ebb7213eddd1edfea631;p=thirdparty%2Fsamba.git

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
---

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 29e2f4f05d0..c48eb3dfb5f 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -7004,6 +7004,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",
@@ -7184,5 +7186,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);
 }