[PATCH] dsdb: Simplify acl_validate_spn_value

[Volker Lendecke]

Hi!

Review appreciated!

Thanks, Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de

SerNet & BSI laden ein: 29. Juni 2016,
2. IT-Grundschutztag 2016, BPA Berlin.
Anmeldung: https://www.sernet.de/gstag
-------------- next part --------------
From f3f9ed45af771dd3facb71cc7a4bc01bae7ed09a Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Fri, 27 May 2016 10:40:55 +0200
Subject: [PATCH] dsdb: Simplify acl_validate_spn_value

Avoid pointless "else" and fix indentation

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 source4/dsdb/samdb/ldb_modules/acl.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/source4/dsdb/samdb/ldb_modules/acl.c b/source4/dsdb/samdb/ldb_modules/acl.c
index 910f9e8..2a98cd8 100644
--- a/source4/dsdb/samdb/ldb_modules/acl.c
+++ b/source4/dsdb/samdb/ldb_modules/acl.c
@@ -604,11 +604,15 @@ static int acl_validate_spn_value(TALLOC_CTX *mem_ctx,
 	/* instanceName can be samAccountName without $ or dnsHostName
 	 * or "ntds_guid._msdcs.forest_domain for DC objects */
 	if (strlen(instanceName) == (strlen(samAccountName) - 1)
-	    && strncasecmp(instanceName, samAccountName, strlen(samAccountName) - 1) == 0) {
+	    && strncasecmp(instanceName, samAccountName,
+			   strlen(samAccountName) - 1) == 0) {
 		goto success;
-	} else if (dnsHostName != NULL && strcasecmp(instanceName, dnsHostName) == 0) {
+	}
+	if ((dnsHostName != NULL) &&
+	    (strcasecmp(instanceName, dnsHostName) == 0)) {
 		goto success;
-	} else if (is_dc) {
+	}
+	if (is_dc) {
 		const char *guid_str;
 		guid_str = talloc_asprintf(mem_ctx,"%s._msdcs.%s",
 					   ntds_guid,
-- 
2.1.4