From 8d60ac19ed0bc70ec3763614147465c04f28e286 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 23 Nov 2012 09:20:50 +0100
Subject: s4:dsdb/descriptor: remove some unnecessary nesting

sd == NULL is checked before.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
---
 source4/dsdb/samdb/ldb_modules/descriptor.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules')

diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 21a559f678..9a4f3d3e04 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -583,16 +583,14 @@ static int descriptor_add(struct ldb_module *module, struct ldb_request *req)
 	if (msg == NULL) {
 		return ldb_oom(ldb);
 	}
-	if (sd != NULL) {
-		if (sd_element != NULL) {
-			sd_element->values[0] = *sd;
-		} else {
-			ret = ldb_msg_add_steal_value(msg,
-						      "nTSecurityDescriptor",
-						      sd);
-			if (ret != LDB_SUCCESS) {
-				return ret;
-			}
+	if (sd_element != NULL) {
+		sd_element->values[0] = *sd;
+	} else {
+		ret = ldb_msg_add_steal_value(msg,
+					      "nTSecurityDescriptor",
+					      sd);
+		if (ret != LDB_SUCCESS) {
+			return ret;
 		}
 	}
 
-- 
cgit