From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 2 Apr 2008 03:26:36 +0000 (+0200)
Subject: wbinfo: use wbcLookupSid()
X-Git-Tag: samba-3.3.0pre1~2924
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b917be4986bd55aeffae03b08cf476ea6302fa26;p=thirdparty%2Fsamba.git

wbinfo: use wbcLookupSid()

metze
---

diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 66ffa8126d0..aac9f3fcb90 100644
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -773,27 +773,30 @@ static bool wbinfo_allocate_gid(void)
 
 /* Convert sid to string */
 
-static bool wbinfo_lookupsid(char *sid)
+static bool wbinfo_lookupsid(const char *sid_str)
 {
-	struct winbindd_request request;
-	struct winbindd_response response;
-
-	ZERO_STRUCT(request);
-	ZERO_STRUCT(response);
+	wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+	struct wbcDomainSid sid;
+	char *domain;
+	char *name;
+	enum wbcSidType type;
 
 	/* Send off request */
 
-	fstrcpy(request.data.sid, sid);
+	wbc_status = wbcStringToSid(sid_str, &sid);
+	if (!WBC_ERROR_IS_OK(wbc_status)) {
+		return false;
+	}
 
-	if (winbindd_request_response(WINBINDD_LOOKUPSID, &request, &response) !=
-	    NSS_STATUS_SUCCESS)
+	wbc_status = wbcLookupSid(&sid, &domain, &name, &type);
+	if (!WBC_ERROR_IS_OK(wbc_status)) {
 		return false;
+	}
 
 	/* 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 %d\n",
+		 domain, winbind_separator(), name, type);
 
 	return true;
 }