From: Günther Deschner <gd@samba.org>
Date: Thu, 15 May 2008 14:41:18 +0000 (+0200)
Subject: dsgetdcname: check for invalid sitename/flag combinations.
X-Git-Tag: samba-4.0.0alpha6~801^2~1371
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e8b43c58d6d276ef5856816f0259df51ccd9837;p=thirdparty%2Fsamba.git

dsgetdcname: check for invalid sitename/flag combinations.

Guenther
(This used to be commit 255e509474cae92802e90613ccaddb6627ee77cd)
---

diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 1538502e9ad..3326c10f5e6 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -582,7 +582,8 @@ static NTSTATUS dsgetdcname_cached(TALLOC_CTX *mem_ctx,
 /****************************************************************
 ****************************************************************/
 
-static bool check_allowed_required_flags(uint32_t flags)
+static bool check_allowed_required_flags(uint32_t flags,
+					 const char *site_name)
 {
 	uint32_t return_type = flags & (DS_RETURN_FLAT_NAME|DS_RETURN_DNS_NAME);
 	uint32_t offered_type = flags & (DS_IS_FLAT_NAME|DS_IS_DNS_NAME);
@@ -593,6 +594,10 @@ static bool check_allowed_required_flags(uint32_t flags)
 
 	debug_dsdcinfo_flags(10, flags);
 
+	if ((flags & DS_TRY_NEXTCLOSEST_SITE) && site_name) {
+		return false;
+	}
+
 	if (return_type == (DS_RETURN_FLAT_NAME|DS_RETURN_DNS_NAME)) {
 		return false;
 	}
@@ -1394,7 +1399,7 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
 
 	*info = NULL;
 
-	if (!check_allowed_required_flags(flags)) {
+	if (!check_allowed_required_flags(flags, site_name)) {
 		DEBUG(0,("invalid flags specified\n"));
 		return NT_STATUS_INVALID_PARAMETER;
 	}