dsdb: Simplify acl_validate_spn_value

Avoid pointless "else" and fix indentation

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source4/dsdb/samdb/ldb_modules/acl.c b/source4/dsdb/samdb/ldb_modules/acl.c
index 910f9e82e53fb847e2f8b8c11e5ff4a08b91c9d5..2a98cd85e75c1f0648397c6c26cbb3b1c5f01135 100644 (file)
--- 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,