diff options
| author | Volker Lendecke <vl@samba.org> | 2016-02-09 07:36:13 +0100 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2016-02-22 20:29:15 +0100 |
| commit | fbbe01782096c8a3c47e1d5f4f5e01de047bf9e2 (patch) | |
| tree | 165f2fe19befafb4cfed932f64e606642290f9d6 /nsswitch | |
| parent | eeb0f3b075bd85cd8a6f0ffdb1829e53a0ec5d20 (diff) | |
| download | samba-fbbe01782096c8a3c47e1d5f4f5e01de047bf9e2.tar.gz | |
libwbclient: Use wbcCtxSidsToUnixIds in wbcCtxSidToUid
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'nsswitch')
| -rw-r--r-- | nsswitch/libwbclient/wbc_idmap.c | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/nsswitch/libwbclient/wbc_idmap.c b/nsswitch/libwbclient/wbc_idmap.c index cc5fce6e1f8..6735d3d3e9e 100644 --- a/nsswitch/libwbclient/wbc_idmap.c +++ b/nsswitch/libwbclient/wbc_idmap.c @@ -29,32 +29,25 @@ wbcErr wbcCtxSidToUid(struct wbcContext *ctx, const struct wbcDomainSid *sid, uid_t *puid) { - struct winbindd_request request; - struct winbindd_response response; - wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE; + struct wbcUnixId xid; + wbcErr wbc_status; if (!sid || !puid) { wbc_status = WBC_ERR_INVALID_PARAM; BAIL_ON_WBC_ERROR(wbc_status); } - /* Initialize request */ - - ZERO_STRUCT(request); - ZERO_STRUCT(response); - - wbcSidToStringBuf(sid, request.data.sid, sizeof(request.data.sid)); - - /* Make request */ - - wbc_status = wbcRequestResponse(ctx, WINBINDD_SID_TO_UID, - &request, - &response); - BAIL_ON_WBC_ERROR(wbc_status); - - *puid = response.data.uid; + wbc_status = wbcCtxSidsToUnixIds(ctx, sid, 1, &xid); + if (!WBC_ERROR_IS_OK(wbc_status)) { + goto done; + } - wbc_status = WBC_ERR_SUCCESS; + if ((xid.type == WBC_ID_TYPE_UID) || (xid.type == WBC_ID_TYPE_BOTH)) { + *puid = xid.id.uid; + wbc_status = WBC_ERR_SUCCESS; + } else { + wbc_status = WBC_ERR_DOMAIN_NOT_FOUND; + } done: return wbc_status; |