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

r17603: Make net_ads_join_ok return NTSTATUS.

Browse Source 
Thanks to Michael Adam <ma@sernet.de>

hop, hop, hop... ;-)

Volker
(This used to be commit 47facab798)
This commit is contained in:
Volker Lendecke 2006-08-18 12:45:51 +00:00 committed by Gerald (Jerry) Carter
parent 01c77cefef
commit 900fe6a625
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/utils/net_ads.c
View File

@ -812,23 +812,25 @@ done:
return ret;
}
static int net_ads_join_ok(void)
static NTSTATUS net_ads_join_ok(void)
{
ADS_STRUCT *ads = NULL;
ADS_STATUS status;
if (!secrets_init()) {
DEBUG(1,("Failed to initialise secrets database\n"));
return -1;
return NT_STATUS_ACCESS_DENIED;
}
net_use_machine_password();
if (!ADS_ERR_OK(ads_startup(True, &ads))) {
return -1;
status = ads_startup(True, &ads);
if (!ADS_ERR_OK(status)) {
return ads_ntstatus(status);
}
ads_destroy(&ads);
return 0;
return NT_STATUS_OK;
}
/*
@ -836,11 +838,14 @@ static int net_ads_join_ok(void)
*/
int net_ads_testjoin(int argc, const char **argv)
{
NTSTATUS status;
use_in_memory_ccache();
/* Display success or failure */
if (net_ads_join_ok() != 0) {
fprintf(stderr,"Join to domain is not valid\n");
status = net_ads_join_ok();
if (!NT_STATUS_IS_OK(status)) {
fprintf(stderr,"Join to domain is not valid: %s\n",
get_friendly_nt_error_msg(status));
return -1;
}