From: Kai Blin <kai@samba.org>
Date: Wed, 30 Apr 2008 06:15:34 +0000 (+0200)
Subject: wbinfo: Output string for sid type in lookupsid.
X-Git-Tag: samba-4.0.0alpha6~801^3~222^2~12
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=1dca64e26a1d79ec0311d340df1f07d9158fbbae;p=ira%2Fwip.git

wbinfo: Output string for sid type in lookupsid.
(This used to be commit 8b4c7fb200598b7f747fc681f76d464760f693ee)
---

diff --git a/source4/nsswitch/wbinfo.c b/source4/nsswitch/wbinfo.c
index 21c178cc7bb..150d9a68ee1 100644
--- a/source4/nsswitch/wbinfo.c
+++ b/source4/nsswitch/wbinfo.c
@@ -614,6 +614,23 @@ static bool wbinfo_sid_to_gid(char *sid)
 	return true;
 }
 
+static const char *sid_type_lookup(enum lsa_SidType r)
+{
+	switch (r) {
+		case SID_NAME_USE_NONE: return "SID_NAME_USE_NONE"; break;
+		case SID_NAME_USER: return "SID_NAME_USER"; break;
+		case SID_NAME_DOM_GRP: return "SID_NAME_DOM_GRP"; break;
+		case SID_NAME_DOMAIN: return "SID_NAME_DOMAIN"; break;
+		case SID_NAME_ALIAS: return "SID_NAME_ALIAS"; break;
+		case SID_NAME_WKN_GRP: return "SID_NAME_WKN_GRP"; break;
+		case SID_NAME_DELETED: return "SID_NAME_DELETED"; break;
+		case SID_NAME_INVALID: return "SID_NAME_INVALID"; break;
+		case SID_NAME_UNKNOWN: return "SID_NAME_UNKNOWN"; break;
+		case SID_NAME_COMPUTER: return "SID_NAME_COMPUTER"; break;
+	}
+	return "Invalid sid type\n";
+}
+
 /* Convert sid to string */
 
 static bool wbinfo_lookupsid(char *sid)
@@ -634,30 +651,13 @@ static bool wbinfo_lookupsid(char *sid)
 
 	/* Display response */
 
-	d_printf("%s%c%s %d\n", response.data.name.dom_name, 
-		 winbind_separator(), response.data.name.name, 
-		 response.data.name.type);
+	d_printf("%s%c%s %s\n", response.data.name.dom_name,
+		 winbind_separator(), response.data.name.name,
+		 sid_type_lookup(response.data.name.type));
 
 	return true;
 }
 
-static const char *sid_type_lookup(enum lsa_SidType r)
-{
-	switch (r) {
-		case SID_NAME_USE_NONE: return "SID_NAME_USE_NONE"; break;
-		case SID_NAME_USER: return "SID_NAME_USER"; break;
-		case SID_NAME_DOM_GRP: return "SID_NAME_DOM_GRP"; break;
-		case SID_NAME_DOMAIN: return "SID_NAME_DOMAIN"; break;
-		case SID_NAME_ALIAS: return "SID_NAME_ALIAS"; break;
-		case SID_NAME_WKN_GRP: return "SID_NAME_WKN_GRP"; break;
-		case SID_NAME_DELETED: return "SID_NAME_DELETED"; break;
-		case SID_NAME_INVALID: return "SID_NAME_INVALID"; break;
-		case SID_NAME_UNKNOWN: return "SID_NAME_UNKNOWN"; break;
-		case SID_NAME_COMPUTER: return "SID_NAME_COMPUTER"; break;
-	}
-	return "Invalid sid type\n";
-}
-
 /* Convert string to sid */
 
 static bool wbinfo_lookupname(char *name)