sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

Add wbcContext to wbcRequestResponse

Browse Source 
To enable libwbclient to pass winbindd context through
to the winbind client library in wb_common.

Signed-off-by: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Matthew Newton 2015-01-24 00:30:00 +00:00 committed by Jeremy Allison
parent bc75e723ce
commit 348f93ff6e
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nsswitch/libwbclient/wbclient.c
View File

@ -56,6 +56,7 @@ void winbindd_ctx_free(struct winbindd_context *ctx);
*/ */
static wbcErr wbcRequestResponseInt( static wbcErr wbcRequestResponseInt(
struct winbindd_context *wbctx,
int cmd, int cmd,
struct winbindd_request *request, struct winbindd_request *request,
struct winbindd_response *response, struct winbindd_response *response,
@ -68,7 +69,7 @@ static wbcErr wbcRequestResponseInt(
/* for some calls the request and/or response can be NULL */ /* for some calls the request and/or response can be NULL */
nss_status = fn(NULL, cmd, request, response); nss_status = fn(wbctx, cmd, request, response);
switch (nss_status) { switch (nss_status) {
case NSS_STATUS_SUCCESS: case NSS_STATUS_SUCCESS:
@ -91,25 +92,38 @@ static wbcErr wbcRequestResponseInt(
/** /**
* @brief Wrapper around Winbind's send/receive API call * @brief Wrapper around Winbind's send/receive API call
* *
* @param ctx Context
* @param cmd Winbind command operation to perform * @param cmd Winbind command operation to perform
* @param request Send structure * @param request Send structure
* @param response Receive structure * @param response Receive structure
* *
* @return #wbcErr * @return #wbcErr
*/ */
wbcErr wbcRequestResponse(int cmd, wbcErr wbcRequestResponse(struct wbcContext *ctx, int cmd,
struct winbindd_request *request, struct winbindd_request *request,
struct winbindd_response *response) struct winbindd_response *response)
{ {
return wbcRequestResponseInt(cmd, request, response, struct winbindd_context *wbctx = NULL;
if (ctx) {
wbctx = ctx->winbindd_ctx;
}
return wbcRequestResponseInt(wbctx, cmd, request, response,
winbindd_request_response); winbindd_request_response);
} }
wbcErr wbcRequestResponsePriv(int cmd, wbcErr wbcRequestResponsePriv(struct wbcContext *ctx, int cmd,
struct winbindd_request *request, struct winbindd_request *request,
struct winbindd_response *response) struct winbindd_response *response)
{ {
return wbcRequestResponseInt(cmd, request, response, struct winbindd_context *wbctx = NULL;
if (ctx) {
wbctx = ctx->winbindd_ctx;
}
return wbcRequestResponseInt(wbctx, cmd, request, response,
winbindd_priv_request_response); winbindd_priv_request_response);
} }

4
nsswitch/libwbclient/wbclient_internal.h
View File

@ -28,11 +28,11 @@ struct wbcContext {
/* Private functions */ /* Private functions */
wbcErr wbcRequestResponse(int cmd, wbcErr wbcRequestResponse(struct wbcContext *ctx, int cmd,
struct winbindd_request *request, struct winbindd_request *request,
struct winbindd_response *response); struct winbindd_response *response);
wbcErr wbcRequestResponsePriv(int cmd, wbcErr wbcRequestResponsePriv(struct wbcContext *ctx, int cmd,
struct winbindd_request *request, struct winbindd_request *request,
struct winbindd_response *response); struct winbindd_response *response);