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

s3:net ads join: reduce indentation and improve logging in the dns update code block

Browse Source 
by doing an early goto done upon error condition
This commit is contained in:
Michael Adam 2012-01-30 13:56:45 +01:00
parent 1d83f2118e
commit 63d9b5d75a
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source3/utils/net_ads.c
View File

@ -1467,22 +1467,26 @@ int net_ads_join(struct net_context *c, int argc, const char **argv)
ADS_STRUCT *ads_dns = NULL;
ads_dns = ads_init(lp_realm(), NULL, r->in.dc_name);
if (ads_dns != NULL) {
/* kinit with the machine password */
use_in_memory_ccache();
if (asprintf( &ads_dns->auth.user_name, "%s$", lp_netbios_name()) == -1) {
goto fail;
}
ads_dns->auth.password = secrets_fetch_machine_password(
r->out.netbios_domain_name, NULL, NULL );
ads_dns->auth.realm = SMB_STRDUP( r->out.dns_domain_name );
strupper_m(ads_dns->auth.realm );
ads_kinit_password( ads_dns );
if (ads_dns == NULL) {
d_fprintf(stderr, _("DNS update failed: out of memory!\n"));
goto done;
}
if ( !ads_dns || !NT_STATUS_IS_OK(net_update_dns( ctx, ads_dns, NULL)) ) {
d_fprintf( stderr, _("DNS update failed!\n") );
/* kinit with the machine password */
use_in_memory_ccache();
if (asprintf( &ads_dns->auth.user_name, "%s$", lp_netbios_name()) == -1) {
goto fail;
}
ads_dns->auth.password = secrets_fetch_machine_password(
r->out.netbios_domain_name, NULL, NULL);
ads_dns->auth.realm = SMB_STRDUP(r->out.dns_domain_name);
strupper_m(ads_dns->auth.realm);
ads_kinit_password(ads_dns);
if (!NT_STATUS_IS_OK(net_update_dns( ctx, ads_dns, NULL))) {
d_fprintf( stderr, _("DNS update failed!\n"));
}
/* exit from this block using machine creds */