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>

diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 21a559f678669f9d3ab9d04c280b3a4d53e16ca5..9a4f3d3e04775ef5d183184546c70b9061874cda 100644 (file)
--- 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;
                }
        }