diff options
author | Michael Adam <obnox@samba.org> | 2012-01-30 13:03:59 +0100 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2012-01-31 17:00:30 +0100 |
commit | 1d83f2118e0e9e1de02909247114ac18ce55a6be (patch) | |
tree | 200a8f77ff2def073bdc03971723752a200ed942 | |
parent | dc4cf82fb573074b4bb063321c86cb306902a4bc (diff) | |
download | samba-1d83f2118e0e9e1de02909247114ac18ce55a6be.tar.gz samba-1d83f2118e0e9e1de02909247114ac18ce55a6be.tar.bz2 samba-1d83f2118e0e9e1de02909247114ac18ce55a6be.zip |
s3:net ads join: untangle assignment from check.
-rw-r--r-- | source3/utils/net_ads.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 0893a1d00d..9c3a0473c2 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -1466,7 +1466,8 @@ int net_ads_join(struct net_context *c, int argc, const char **argv) /* We enter this block with user creds */ ADS_STRUCT *ads_dns = NULL; - if ( (ads_dns = ads_init( lp_realm(), NULL, r->in.dc_name )) != 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(); |