1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00

Optimization. Don't do the retry logic if sitename_fetch() returned NULL, we already did a NULL query.

Bug 5917 - Samba does not work on site with Read Only Domain Controller

Signed-off-by: Jeremy Allison <jra@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Sep  4 01:19:05 CEST 2013 on sn-devel-104
This commit is contained in:
Jeremy Allison 2013-09-03 14:07:43 -07:00 committed by Andrew Bartlett
parent 68e7b1c944
commit bdab6f9431

View File

@ -1181,9 +1181,13 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
NTSTATUS status;
const char *query_site = NULL;
char *ptr_to_free = NULL;
bool retry_query_with_null = false;
if ((site_name == NULL) || (site_name[0] == '\0')) {
ptr_to_free = sitename_fetch(domain_name);
if (ptr_to_free != NULL) {
retry_query_with_null = true;
}
query_site = ptr_to_free;
} else {
query_site = site_name;
@ -1204,7 +1208,7 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
}
/* Should we try again with site_name == NULL ? */
if ((site_name == NULL) || (site_name[0] == '\0')) {
if (retry_query_with_null) {
status = dsgetdcname_internal(mem_ctx,
msg_ctx,
domain_name,