summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-01-08 08:05:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:57 -0500
commit3ab9f619d822cd39cc23d0cdca04eb483e026ee8 (patch)
tree5ee93047d1d9656903518b140690e5a01d2d372f
parentc79be5713ab5e01e4291b3b66e593c133f8fa9d7 (diff)
downloadsamba-3ab9f619d822cd39cc23d0cdca04eb483e026ee8.tar.gz
samba-3ab9f619d822cd39cc23d0cdca04eb483e026ee8.tar.bz2
samba-3ab9f619d822cd39cc23d0cdca04eb483e026ee8.zip
r20603: Slightly simplify logic
(This used to be commit e4dea0e64747912da899e846b944c24804772259)
-rw-r--r--source3/libsmb/namequery.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index c232ad4938..13d3517cdd 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1505,16 +1505,16 @@ static NTSTATUS get_dc_list(const char *domain, struct ip_service **ip_list,
just return the list of DC's. Or maybe we just failed. */
if ( (num_addresses == 0) ) {
- if ( !done_auto_lookup ) {
- if (internal_resolve_name(domain, 0x1C, ip_list, count, resolve_order)) {
- return NT_STATUS_OK;
- } else {
- return NT_STATUS_NO_LOGON_SERVERS;
- }
- } else {
+ if ( done_auto_lookup ) {
DEBUG(4,("get_dc_list: no servers found\n"));
return NT_STATUS_NO_LOGON_SERVERS;
}
+ if (internal_resolve_name(domain, 0x1C, ip_list, count,
+ resolve_order)) {
+ return NT_STATUS_OK;
+ } else {
+ return NT_STATUS_NO_LOGON_SERVERS;
+ }
}
if ( (return_iplist = SMB_MALLOC_ARRAY(struct ip_service, num_addresses)) == NULL ) {