From: Volker Lendecke <vl@samba.org>
Date: Fri, 11 Jul 2008 15:42:40 +0000 (+0200)
Subject: Revert "Tiny logic simplification -- remove an else branch"
X-Git-Tag: samba-3.3.0pre1~582
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0fe0c7ac18d4f47ad4a218114de7bab7a3f19de;p=thirdparty%2Fsamba.git

Revert "Tiny logic simplification -- remove an else branch"

This reverts commit 01c8c7bbf6163d5c7733db0d8ecbccfe7e4fec7d.
---

diff --git a/source/winbindd/winbindd_idmap.c b/source/winbindd/winbindd_idmap.c
index 631f5c1ab48..98f8548083d 100644
--- a/source/winbindd/winbindd_idmap.c
+++ b/source/winbindd/winbindd_idmap.c
@@ -241,31 +241,33 @@ enum winbindd_result winbindd_dual_sids2xids(struct winbindd_domain *domain,
 
 	result = idmap_sids_to_unixids(ids, num);
 
-	if (!NT_STATUS_IS_OK(result)) {
-		DEBUG (2, ("idmap_sids_to_unixids returned an error: 0x%08x\n",
-			   NT_STATUS_V(result)));
-		talloc_free(ids);
-		return WINBINDD_ERROR;
-	}
+	if (NT_STATUS_IS_OK(result)) {
 
-	xids = SMB_MALLOC_ARRAY(struct unixid, num);
-	if ( ! xids) {
-		DEBUG(0, ("Out of memory!\n"));
-		talloc_free(ids);
-		return WINBINDD_ERROR;
-	}
+		xids = SMB_MALLOC_ARRAY(struct unixid, num);
+		if ( ! xids) {
+			DEBUG(0, ("Out of memory!\n"));
+			talloc_free(ids);
+			return WINBINDD_ERROR;
+		}
 
-	for (i = 0; i < num; i++) {
-		if (ids[i]->status == ID_MAPPED) {
-			xids[i].type = ids[i]->xid.type;
-			xids[i].id = ids[i]->xid.id;
-		} else {
-			xids[i].type = -1;
+		for (i = 0; i < num; i++) {
+			if (ids[i]->status == ID_MAPPED) {
+				xids[i].type = ids[i]->xid.type;
+				xids[i].id = ids[i]->xid.id;
+			} else {
+				xids[i].type = -1;
+			}
 		}
+
+		state->response.length = sizeof(state->response) + (sizeof(struct unixid) * num);
+		state->response.extra_data.data = xids;
+
+	} else {
+		DEBUG (2, ("idmap_sids_to_unixids returned an error: 0x%08x\n", NT_STATUS_V(result)));
+		talloc_free(ids);
+		return WINBINDD_ERROR;
 	}
 
-	state->response.length = sizeof(state->response) + (sizeof(struct unixid) * num);
-	state->response.extra_data.data = xids;
 	talloc_free(ids);
 	return WINBINDD_OK;
 }