From: Günther Deschner <gd@samba.org>
Date: Mon, 10 Jan 2011 10:57:18 +0000 (+0100)
Subject: libcli/security: fix sid_type_lookup().
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=45227e96c2cff017dd0ecd29d9e93e89d71b7573;p=samba.git

libcli/security: fix sid_type_lookup().

It *always* returned "SID *TYPE* is INVALID".

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Jan 10 12:47:00 CET 2011 on sn-devel-104
---

diff --git a/libcli/security/util_sid.c b/libcli/security/util_sid.c
index 52d48ce4315..3d14536eae6 100644
--- a/libcli/security/util_sid.c
+++ b/libcli/security/util_sid.c
@@ -126,20 +126,18 @@ static const struct {
 	{SID_NAME_DELETED, "Deleted Account"},
 	{SID_NAME_INVALID, "Invalid Account"},
 	{SID_NAME_UNKNOWN, "UNKNOWN"},
-	{SID_NAME_COMPUTER, "Computer"},
-
-	{(enum lsa_SidType)0, NULL}
+	{SID_NAME_COMPUTER, "Computer"}
 };
 
 const char *sid_type_lookup(uint32_t sid_type)
 {
-	int i = 0;
+	int i;
 
 	/* Look through list */
-	while(sid_name_type[i].sid_type != 0) {
-		if (sid_name_type[i].sid_type == sid_type)
+	for (i=0; i < ARRAY_SIZE(sid_name_type); i++) {
+		if (sid_name_type[i].sid_type == sid_type) {
 			return sid_name_type[i].string;
-		i++;
+		}
 	}
 
 	/* Default return */