From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 16 Jan 2013 09:05:56 +0000 (+0100)
Subject: libcli/security: simplify get_ace_object_type()
X-Git-Tag: ldb-1.1.15~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3fffde368fa0c6594f7fd5309e0b20d3fa7c68e;p=thirdparty%2Fsamba.git

libcli/security: simplify get_ace_object_type()

Signed-off-by: Stefan Metzmacher <metze@samba.org>

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

diff --git a/libcli/security/access_check.c b/libcli/security/access_check.c
index 3be322ef212..83b7f9bd6cb 100644
--- a/libcli/security/access_check.c
+++ b/libcli/security/access_check.c
@@ -367,15 +367,11 @@ NTSTATUS se_file_access_check(const struct security_descriptor *sd,
 
 static const struct GUID *get_ace_object_type(struct security_ace *ace)
 {
-	struct GUID *type;
-
-	if (ace->object.object.flags & SEC_ACE_OBJECT_TYPE_PRESENT)
-		type = &ace->object.object.type.type;
-	else
-		type = NULL;
-
-	return type;
+	if (ace->object.object.flags & SEC_ACE_OBJECT_TYPE_PRESENT) {
+		return &ace->object.object.type.type;
+	}
 
+	return NULL;
 }
 
 /* modified access check for the purposes of DS security