diff options
| author | Günther Deschner <gd@samba.org> | 2008-05-07 14:09:41 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-05-07 14:09:41 +0200 |
| commit | 7b5ec90b727b4653ca7ccd05cb0f51ff5c670971 (patch) | |
| tree | b3386122bba0fbe77584ec72cf004b3c20d109ef /source3 | |
| parent | f847929c2c25159fef7c1c419ce1819f2afe558f (diff) | |
| download | samba-7b5ec90b727b4653ca7ccd05cb0f51ff5c670971.tar.gz samba-7b5ec90b727b4653ca7ccd05cb0f51ff5c670971.tar.bz2 samba-7b5ec90b727b4653ca7ccd05cb0f51ff5c670971.zip | |
dsgetdcname: remove invalid assumptions when using DNS for the DC query.
Guenther
(This used to be commit a81818ae54159755df441cc6421e5b272035f412)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libsmb/dsgetdcname.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c index 1bd54d80e6..1006b975c7 100644 --- a/source3/libsmb/dsgetdcname.c +++ b/source3/libsmb/dsgetdcname.c @@ -466,14 +466,6 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx, struct ip_service_name *dclist = NULL; int count = 0; - if ((!(flags & DS_DIRECTORY_SERVICE_REQUIRED)) && - (!(flags & DS_KDC_REQUIRED)) && - (!(flags & DS_GC_SERVER_REQUIRED)) && - (!(flags & DS_PDC_REQUIRED))) { - DEBUG(1,("discover_dc_dns: invalid flags\n")); - return NT_STATUS_INVALID_PARAMETER; - } - if (flags & DS_PDC_REQUIRED) { status = ads_dns_query_pdc(mem_ctx, domain_name, &dcs, &numdcs); @@ -490,9 +482,8 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx, status = ads_dns_query_dcs_guid(mem_ctx, domain_name, domain_guid, &dcs, &numdcs); } else { - /* FIXME: ? */ - DEBUG(1,("discover_dc_dns: not enough input\n")); - status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND; + status = ads_dns_query_dcs(mem_ctx, domain_name, site_name, + &dcs, &numdcs); } if (!NT_STATUS_IS_OK(status)) { |