sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

Rename server_name to dc_name in libnet join structures.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2008-01-04 17:11:14 +01:00
parent b59ca2d9c3
commit ff5e15b1ba
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/lib/netapi/joindomain.c
View File

@ -54,8 +54,9 @@ static WERROR NetJoinDomainLocal(struct libnetapi_ctx *mem_ctx,
if (!NT_STATUS_IS_OK(status)) {
return ntstatus_to_werror(status);
}
r->in.server_name = talloc_strdup(mem_ctx, info->domain_controller_name);
W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
r->in.dc_name = talloc_strdup(mem_ctx,
info->domain_controller_name);
W_ERROR_HAVE_NO_MEMORY(r->in.dc_name);
}
if (account_ou) {
@ -224,8 +225,8 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
W_ERROR_NOT_OK_RETURN(werr);
if (server_name) {
r->in.server_name = talloc_strdup(mem_ctx, server_name);
W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
r->in.dc_name = talloc_strdup(mem_ctx, server_name);
W_ERROR_HAVE_NO_MEMORY(r->in.dc_name);
} else {
NTSTATUS status;
@ -244,8 +245,9 @@ static WERROR NetUnjoinDomainLocal(struct libnetapi_ctx *mem_ctx,
if (!NT_STATUS_IS_OK(status)) {
return ntstatus_to_werror(status);
}
r->in.server_name = talloc_strdup(mem_ctx, info->domain_controller_name);
W_ERROR_HAVE_NO_MEMORY(r->in.server_name);
r->in.dc_name = talloc_strdup(mem_ctx,
info->domain_controller_name);
W_ERROR_HAVE_NO_MEMORY(r->in.dc_name);
}
if (account) {

6
source/libnet/libnet_join.c
View File

@ -69,7 +69,8 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
NT_STATUS_HAVE_NO_MEMORY(r->in.machine_password);
}
status = cli_full_connection(&cli, NULL, r->in.server_name,
status = cli_full_connection(&cli, NULL,
r->in.dc_name,
NULL, 0,
"IPC$", "IPC",
r->in.admin_account,
@ -253,7 +254,8 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
SAM_USERINFO_CTR ctr, *qctr = NULL;
SAM_USER_INFO_16 p16;
status = cli_full_connection(&cli, NULL, r->in.server_name,
status = cli_full_connection(&cli, NULL,
r->in.dc_name,
NULL, 0,
"IPC$", "IPC",
r->in.admin_account,

5
source/libnet/libnet_join.h
View File

@ -22,7 +22,8 @@
struct libnet_JoinCtx {
struct {
const char *server_name;
const char *dc_name;
const char *machine_name;
const char *domain_name;
const char *account_ou;
const char *admin_account;
@ -48,7 +49,7 @@ struct libnet_JoinCtx {
struct libnet_UnjoinCtx {
struct {
const char *server_name;
const char *dc_name;
const char *domain_name;
const char *admin_account;
const char *admin_password;