sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-06 17:32:29 +03:00
Code Activity

Fix net_dom_join & net_dom_unjoin.

Browse Source 
Guenther
(This used to be commit 6dd17e4840)
This commit is contained in:
Günther Deschner
2007-12-22 00:34:30 +01:00
parent 30a788bd20
commit 9fc2c21fa6
1 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
source3/utils/net_dom.c
View File

@ -43,6 +43,7 @@ int net_help_dom(int argc, const char **argv)
static int net_dom_unjoin(int argc, const char **argv)
{
struct libnetapi_ctx *ctx = NULL;
const char *server_name = NULL;
const char *account = NULL;
const char *password = NULL;
@ -50,8 +51,8 @@ static int net_dom_unjoin(int argc, const char **argv)
WKSSVC_JOIN_FLAGS_JOIN_TYPE;
struct cli_state *cli = NULL;
bool reboot = false;
NTSTATUS status;
NET_API_STATUS werr;
NTSTATUS ntstatus;
NET_API_STATUS status;
int ret = -1;
int i;
@ -82,17 +83,25 @@ static int net_dom_unjoin(int argc, const char **argv)
}
if (reboot) {
status = net_make_ipc_connection_ex(opt_workgroup, server_name,
NULL, 0, &cli);
if (!NT_STATUS_IS_OK(status)) {
ntstatus = net_make_ipc_connection_ex(opt_workgroup, server_name,
NULL, 0, &cli);
if (!NT_STATUS_IS_OK(ntstatus)) {
return -1;
}
}
werr = NetUnjoinDomain(server_name, account, password, unjoin_flags);
if (werr != 0) {
status = libnetapi_init(&ctx);
if (status != 0) {
return -1;
}
libnetapi_set_username(ctx, opt_user_name);
libnetapi_set_password(ctx, opt_password);
status = NetUnjoinDomain(server_name, account, password, unjoin_flags);
if (status != 0) {
printf("Failed to unjoin domain: %s\n",
get_friendly_nt_error_msg(werror_to_ntstatus(W_ERROR(werr))));
libnetapi_errstr(ctx, status));
goto done;
}
@ -121,11 +130,13 @@ static int net_dom_unjoin(int argc, const char **argv)
cli_shutdown(cli);
}
/* libnetapi_free(ctx); */
return ret;
}
static int net_dom_join(int argc, const char **argv)
{
struct libnetapi_ctx *ctx = NULL;
const char *server_name = NULL;
const char *domain_name = NULL;
const char *account_ou = NULL;
@ -135,8 +146,8 @@ static int net_dom_join(int argc, const char **argv)
WKSSVC_JOIN_FLAGS_JOIN_TYPE;
struct cli_state *cli = NULL;
bool reboot = false;
NTSTATUS status;
NET_API_STATUS werr;
NTSTATUS ntstatus;
NET_API_STATUS status;
int ret = -1;
int i;
@ -183,21 +194,28 @@ static int net_dom_join(int argc, const char **argv)
}
if (reboot) {
status = net_make_ipc_connection_ex(opt_workgroup, server_name,
NULL, 0, &cli);
if (!NT_STATUS_IS_OK(status)) {
ntstatus = net_make_ipc_connection_ex(opt_workgroup, server_name,
NULL, 0, &cli);
if (!NT_STATUS_IS_OK(ntstatus)) {
return -1;
}
}
/* check if domain is a domain or a workgroup */
werr = NetJoinDomain(server_name, domain_name, account_ou,
Account, password, join_flags);
if (werr != 0) {
printf("Failed to join domain: %s (WERROR: %s)\n",
get_friendly_nt_error_msg(werror_to_ntstatus(W_ERROR(werr))),
dos_errstr(W_ERROR(werr)));
status = libnetapi_init(&ctx);
if (status != 0) {
return -1;
}
libnetapi_set_username(ctx, opt_user_name);
libnetapi_set_password(ctx, opt_password);
status = NetJoinDomain(server_name, domain_name, account_ou,
Account, password, join_flags);
if (status != 0) {
printf("Failed to join domain: %s\n",
libnetapi_errstr(ctx, status));
goto done;
}
@ -226,6 +244,7 @@ static int net_dom_join(int argc, const char **argv)
cli_shutdown(cli);
}
/* libnetapi_free(ctx); */
return ret;
}