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

Nicen some error strings in libnetjoin.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner
2008-01-16 10:48:11 +01:00
parent 357a393b10
commit 05cf1413cc
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/libnet/libnet_join.c
View File

@@ -1176,8 +1176,9 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
&info); &info);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
libnet_join_set_error_string(mem_ctx, r, libnet_join_set_error_string(mem_ctx, r,
"failed to find DC: %s", "failed to find DC for domain %s",
nt_errstr(status)); r->in.domain_name,
get_friendly_nt_error_msg(status));
return WERR_DOMAIN_CONTROLLER_NOT_FOUND; return WERR_DOMAIN_CONTROLLER_NOT_FOUND;
} }
@@ -1211,7 +1212,7 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
libnet_join_set_error_string(mem_ctx, r, libnet_join_set_error_string(mem_ctx, r,
"failed to join domain over rpc: %s", "failed to join domain over rpc: %s",
nt_errstr(status)); get_friendly_nt_error_msg(status));
if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) { if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
return WERR_SETUP_ALREADY_JOINED; return WERR_SETUP_ALREADY_JOINED;
} }
@@ -1292,8 +1293,9 @@ static WERROR libnet_DomainUnjoin(TALLOC_CTX *mem_ctx,
&info); &info);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
libnet_unjoin_set_error_string(mem_ctx, r, libnet_unjoin_set_error_string(mem_ctx, r,
"failed to find DC: %s", "failed to find DC for domain %s",
nt_errstr(status)); r->in.domain_name,
get_friendly_nt_error_msg(status));
return WERR_DOMAIN_CONTROLLER_NOT_FOUND; return WERR_DOMAIN_CONTROLLER_NOT_FOUND;
} }
@@ -1305,8 +1307,8 @@ static WERROR libnet_DomainUnjoin(TALLOC_CTX *mem_ctx,
status = libnet_join_unjoindomain_rpc(mem_ctx, r); status = libnet_join_unjoindomain_rpc(mem_ctx, r);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
libnet_unjoin_set_error_string(mem_ctx, r, libnet_unjoin_set_error_string(mem_ctx, r,
"failed to unjoin domain: %s", "failed to disable machine account via rpc: %s",
nt_errstr(status)); get_friendly_nt_error_msg(status));
if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)) { if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)) {
return WERR_SETUP_NOT_JOINED; return WERR_SETUP_NOT_JOINED;
} }
@@ -1350,6 +1352,7 @@ static WERROR libnet_unjoin_pre_processing(TALLOC_CTX *mem_ctx,
return WERR_OK; return WERR_OK;
} }
/**************************************************************** /****************************************************************
****************************************************************/ ****************************************************************/