diff options
| author | Günther Deschner <gd@samba.org> | 2008-02-28 11:29:56 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-02-28 11:38:01 +0100 |
| commit | c4ba68aa94888eace393b91a669e22b27ffaba3e (patch) | |
| tree | cf4c81a05a529ee4fc2a3564848149fe83126387 | |
| parent | 95bdf2f23c195cad1b317995e362f153695e793a (diff) | |
| download | samba-c4ba68aa94888eace393b91a669e22b27ffaba3e.tar.gz samba-c4ba68aa94888eace393b91a669e22b27ffaba3e.tar.xz samba-c4ba68aa94888eace393b91a669e22b27ffaba3e.zip | |
Store domain_is_ad info as early as possible in libnetjoin.
Guenther
| -rw-r--r-- | source/libnet/libnet_join.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c index 31eec805619..d2242ffb2c8 100644 --- a/source/libnet/libnet_join.c +++ b/source/libnet/libnet_join.c @@ -152,9 +152,24 @@ static ADS_STATUS libnet_join_connect_ads(TALLOC_CTX *mem_ctx, libnet_join_set_error_string(mem_ctx, r, "failed to connect to AD: %s", ads_errstr(status)); + return status; } - return status; + if (!r->out.netbios_domain_name) { + r->out.netbios_domain_name = talloc_strdup(mem_ctx, + r->in.ads->server.workgroup); + ADS_ERROR_HAVE_NO_MEMORY(r->out.netbios_domain_name); + } + + if (!r->out.dns_domain_name) { + r->out.dns_domain_name = talloc_strdup(mem_ctx, + r->in.ads->config.realm); + ADS_ERROR_HAVE_NO_MEMORY(r->out.dns_domain_name); + } + + r->out.domain_is_ad = true; + + return ADS_SUCCESS; } /**************************************************************** |