summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-11-03 09:36:29 +0100
committerAndrew Bartlett <abartlet@samba.org>2012-11-06 08:27:44 +1100
commit26faa8fe3a42f9d1278d81773c8808b05fcd76f8 (patch)
tree4b7222ee29c164059b29a169d73f954aee14dca8
parentec3cbb6c476698523c9b5ac047787df101746891 (diff)
downloadsamba-26faa8fe3a42f9d1278d81773c8808b05fcd76f8.tar.gz
samba-26faa8fe3a42f9d1278d81773c8808b05fcd76f8.tar.bz2
samba-26faa8fe3a42f9d1278d81773c8808b05fcd76f8.zip
dsdb: Simplify DsCrackNameOneFilter a bit
For me "else" branches clutter my flow reading code. If we do a hard return at the end of an "if" branch, "else" is not required. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source4/dsdb/samdb/cracknames.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index 8b52aa3199..f136dec7fa 100644
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -1070,7 +1070,10 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
if (sid == NULL) {
info1->status = DRSUAPI_DS_NAME_STATUS_NO_MAPPING;
return WERR_OK;
- } else if (samdb_find_attribute(sam_ctx, result, "objectClass", "domain")) {
+ }
+
+ if (samdb_find_attribute(sam_ctx, result, "objectClass",
+ "domain")) {
/* This can also find a DomainDNSZones entry,
* but it won't have the SID we just
* checked. */