sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

r5924: Use cli_credentials in libnet/.

Browse Source 
(This used to be commit e5bc6f4f1716568ae7022d61b5b35ee047b58414)
This commit is contained in:
Jelmer Vernooij 2005-03-21 18:42:32 +00:00 committed by Gerald (Jerry) Carter
parent 02075be0bb
commit 34cde06513
6 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/libnet/libnet.h
View File

@ -25,11 +25,7 @@ struct libnet_context {
* a client env context
* a user env context
*/
struct {
const char *account_name;
const char *domain_name;
const char *password;
} user;
struct cli_credentials *credentials;
};
#include "libnet/libnet_passwd.h"

6
source4/libnet/libnet_rpc.c
View File

@ -102,9 +102,9 @@ static NTSTATUS libnet_rpc_connect_standard(struct libnet_context *ctx, TALLOC_C
r->standard.in.dcerpc_iface_uuid,
r->standard.in.dcerpc_iface_version,
lp_netbios_name(),
ctx->user.domain_name,
ctx->user.account_name,
ctx->user.password);
cli_credentials_get_domain(ctx->credentials),
cli_credentials_get_username(ctx->credentials),
cli_credentials_get_password(ctx->credentials));
if (!NT_STATUS_IS_OK(status)) {
r->standard.out.error_string = talloc_asprintf(mem_ctx,
"dcerpc_pipe_connect to pipe %s failed with %s\n",

4
source4/utils/net/net_join.c
View File

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

8
source4/utils/net/net_password.c
View File

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

4
source4/utils/net/net_time.c
View File

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

6
source4/utils/net/net_user.c
View File

@ -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)) {