summaryrefslogtreecommitdiff
path: root/source3/utils/net_rpc.c
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-04-21 20:14:32 +0200
committerGünther Deschner <gd@samba.org>2008-04-21 20:21:40 +0200
commitba0bf87d967a9544b9c97525994a43ad5b6f1f60 (patch)
tree6c8d2e1361e54ac8116fd60d56868ff3f9cc3a4a /source3/utils/net_rpc.c
parente03a2ad01b26df92c843956e4cd2a46e7d6f1f56 (diff)
downloadsamba-ba0bf87d967a9544b9c97525994a43ad5b6f1f60.tar.gz
samba-ba0bf87d967a9544b9c97525994a43ad5b6f1f60.tar.bz2
samba-ba0bf87d967a9544b9c97525994a43ad5b6f1f60.zip
net: Add libnetapi context to net's impressive list of globals.
Guenther (This used to be commit 8a5fadf6a183e4e4ccc77283b3ddba0748c6abfb)
Diffstat (limited to 'source3/utils/net_rpc.c')
-rw-r--r--source3/utils/net_rpc.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 924398fc33..5845c14314 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -601,7 +601,7 @@ static int rpc_user_add(int argc, const char **argv)
if (status != 0) {
d_fprintf(stderr, "Failed to add user '%s' with: %s.\n",
- argv[0], libnetapi_get_error_string(NULL, status));
+ argv[0], libnetapi_get_error_string(netapi_ctx, status));
return -1;
} else {
d_printf("Added user '%s'.\n", argv[0]);
@@ -769,7 +769,7 @@ static int rpc_user_delete(int argc, const char **argv)
if (status != 0) {
d_fprintf(stderr, "Failed to delete user '%s' with: %s.\n",
argv[0],
- libnetapi_get_error_string(NULL, status));
+ libnetapi_get_error_string(netapi_ctx, status));
return -1;
} else {
d_printf("Deleted user '%s'.\n", argv[0]);
@@ -1147,7 +1147,6 @@ static NTSTATUS rpc_user_list_internals(const DOM_SID *domain_sid,
int net_rpc_user(int argc, const char **argv)
{
- struct libnetapi_ctx *ctx = NULL;
NET_API_STATUS status;
struct functable func[] = {
@@ -1159,12 +1158,12 @@ int net_rpc_user(int argc, const char **argv)
{NULL, NULL}
};
- status = libnetapi_init(&ctx);
+ status = libnetapi_init(&netapi_ctx);
if (status != 0) {
return -1;
}
- libnetapi_set_username(ctx, opt_user_name);
- libnetapi_set_password(ctx, opt_password);
+ libnetapi_set_username(netapi_ctx, opt_user_name);
+ libnetapi_set_password(netapi_ctx, opt_password);
if (argc == 0) {
return run_rpc_command(NULL,PI_SAMR, 0,