summaryrefslogtreecommitdiff
path: root/source4/utils
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-03-21 18:42:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:11:08 -0500
commit34cde065139fdc76f6aa529426cfc1f68a394d54 (patch)
tree97d8ce9783f8a0e3d263095eed2a9fbeee294423 /source4/utils
parent02075be0bbc2095073f8898350fded64a7c97c79 (diff)
downloadsamba-34cde065139fdc76f6aa529426cfc1f68a394d54.tar.gz
samba-34cde065139fdc76f6aa529426cfc1f68a394d54.tar.bz2
samba-34cde065139fdc76f6aa529426cfc1f68a394d54.zip
r5924: Use cli_credentials in libnet/.
(This used to be commit e5bc6f4f1716568ae7022d61b5b35ee047b58414)
Diffstat (limited to 'source4/utils')
-rw-r--r--source4/utils/net/net_join.c4
-rw-r--r--source4/utils/net/net_password.c8
-rw-r--r--source4/utils/net/net_time.c4
-rw-r--r--source4/utils/net/net_user.c6
4 files changed, 6 insertions, 16 deletions
diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c
index 3a0a52cab5..212b8270ff 100644
--- a/source4/utils/net/net_join.c
+++ b/source4/utils/net/net_join.c
@@ -61,9 +61,7 @@ int net_join(struct net_context *ctx, int argc, const char **argv)
if (!libnetctx) {
return -1;
}
- libnetctx->user.account_name= cli_credentials_get_username(ctx->credentials);
- libnetctx->user.domain_name = cli_credentials_get_domain(ctx->credentials);
- libnetctx->user.password = cli_credentials_get_password(ctx->credentials);
+ libnetctx->credentials = ctx->credentials;
/* prepare password change */
r.generic.level = LIBNET_JOIN_GENERIC;
diff --git a/source4/utils/net/net_password.c b/source4/utils/net/net_password.c
index a68c0b1c6a..08660fe2a0 100644
--- a/source4/utils/net/net_password.c
+++ b/source4/utils/net/net_password.c
@@ -57,9 +57,7 @@ static int net_password_change(struct net_context *ctx, int argc, const char **a
if (!libnetctx) {
return -1;
}
- libnetctx->user.account_name= cli_credentials_get_username(ctx->credentials);
- libnetctx->user.domain_name = cli_credentials_get_domain(ctx->credentials);
- libnetctx->user.password = cli_credentials_get_password(ctx->credentials);
+ libnetctx->credentials = ctx->credentials;
/* prepare password change */
r.generic.level = LIBNET_CHANGE_PASSWORD_GENERIC;
@@ -134,9 +132,7 @@ static int net_password_set(struct net_context *ctx, int argc, const char **argv
if (!libnetctx) {
return -1;
}
- libnetctx->user.account_name= cli_credentials_get_username(ctx->credentials);
- libnetctx->user.domain_name = cli_credentials_get_domain(ctx->credentials);
- libnetctx->user.password = cli_credentials_get_password(ctx->credentials);
+ libnetctx->credentials = ctx->credentials;
/* prepare password change */
r.generic.level = LIBNET_SET_PASSWORD_GENERIC;
diff --git a/source4/utils/net/net_time.c b/source4/utils/net/net_time.c
index df3b52a4ab..a89f80417c 100644
--- a/source4/utils/net/net_time.c
+++ b/source4/utils/net/net_time.c
@@ -47,9 +47,7 @@ int net_time(struct net_context *ctx, int argc, const char **argv)
if (!libnetctx) {
return -1;
}
- libnetctx->user.account_name= cli_credentials_get_username(ctx->credentials);
- libnetctx->user.domain_name = cli_credentials_get_domain(ctx->credentials);
- libnetctx->user.password = cli_credentials_get_password(ctx->credentials);
+ libnetctx->credentials = ctx->credentials;
/* prepare to get the time */
r.generic.level = LIBNET_REMOTE_TOD_GENERIC;
diff --git a/source4/utils/net/net_user.c b/source4/utils/net/net_user.c
index 82f80b9e60..40e821bf83 100644
--- a/source4/utils/net/net_user.c
+++ b/source4/utils/net/net_user.c
@@ -47,14 +47,12 @@ static int net_user_add(struct net_context *ctx, int argc, const char **argv)
lnet_ctx = libnet_context_init();
if (!lnet_ctx) return -1;
- lnet_ctx->user.domain_name = cli_credentials_get_domain(ctx->credentials);
- lnet_ctx->user.account_name = cli_credentials_get_username(ctx->credentials);
- lnet_ctx->user.password = cli_credentials_get_password(ctx->credentials);
+ lnet_ctx->credentials = ctx->credentials;
/* calling CreateUser function */
r.generic.level = LIBNET_CREATE_USER_GENERIC;
r.generic.in.user_name = user_name;
- r.generic.in.domain_name = lnet_ctx->user.domain_name;
+ r.generic.in.domain_name = cli_credentials_get_domain(lnet_ctx->credentials);
status = libnet_CreateUser(lnet_ctx, ctx->mem_ctx, &r);
if (!NT_STATUS_IS_OK(status)) {