sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-22 16:23:49 +03:00
Code Activity

Fix some error strings in libnet_join.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner
2008-01-12 02:20:33 +01:00
parent 4a7acf4a23
commit 8af80976a3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/libnet/libnet_join.c
View File

@@ -457,7 +457,8 @@ static bool libnet_join_derive_salting_principal(TALLOC_CTX *mem_ctx,
status = ads_domain_func_level(r->in.ads, &domain_func); status = ads_domain_func_level(r->in.ads, &domain_func);
if (!ADS_ERR_OK(status)) { if (!ADS_ERR_OK(status)) {
libnet_join_set_error_string(mem_ctx, r, libnet_join_set_error_string(mem_ctx, r,
"Failed to determine domain functional level!"); "failed to determine domain functional level: %s",
ads_errstr(status));
return false; return false;
} }
@@ -1081,8 +1082,12 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
r->in.join_flags &= ~WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE; r->in.join_flags &= ~WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE;
} }
#endif /* WITH_ADS */ #endif /* WITH_ADS */
status = libnet_join_joindomain_rpc(mem_ctx, r); status = libnet_join_joindomain_rpc(mem_ctx, r);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
libnet_join_set_error_string(mem_ctx, r,
"failed to join domain over rpc: %s",
nt_errstr(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;
} }