sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Move wbc global variables into global context instead

Browse Source 
There are some global variables in use in the libwbclient
library. Now that we have a context, move these into it so that
they are thread-safe when the wbcCtx* functions are used.

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-02-22 23:31:48 +00:00 committed by Jeremy Allison
parent 063c56dba5
commit 2664d9070f
3 changed files with 73 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
nsswitch/libwbclient/wbc_pwd.c
View File

@ -4,6 +4,7 @@
Winbind client API
Copyright (C) Gerald (Jerry) Carter 2007
Copyright (C) Matthew Newton 2015
This library is free software; you can redistribute it and/or
@ -359,16 +360,6 @@ wbcErr wbcGetgrgid(gid_t gid, struct group **grp)
return wbcCtxGetgrgid(NULL, gid, grp);
}
/** @brief Number of cached passwd structs
*
*/
static uint32_t pw_cache_size;
/** @brief Position of the pwent context
*
*/
static uint32_t pw_cache_idx;
/** @brief Winbindd response containing the passwd structs
*
*/
@ -379,8 +370,12 @@ wbcErr wbcCtxSetpwent(struct wbcContext *ctx)
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
if (pw_cache_size > 0) {
pw_cache_idx = pw_cache_size = 0;
if (!ctx) {
ctx = wbcGetGlobalCtx();
}
if (ctx->pw_cache_size > 0) {
ctx->pw_cache_idx = ctx->pw_cache_size = 0;
winbindd_free_response(&pw_response);
}
@ -404,8 +399,12 @@ wbcErr wbcCtxEndpwent(struct wbcContext *ctx)
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
if (pw_cache_size > 0) {
pw_cache_idx = pw_cache_size = 0;
if (!ctx) {
ctx = wbcGetGlobalCtx();
}
if (ctx->pw_cache_size > 0) {
ctx->pw_cache_idx = ctx->pw_cache_size = 0;
winbindd_free_response(&pw_response);
}
@ -429,14 +428,18 @@ wbcErr wbcCtxGetpwent(struct wbcContext *ctx, struct passwd **pwd)
struct winbindd_request request;
struct winbindd_pw *wb_pw;
if (!ctx) {
ctx = wbcGetGlobalCtx();
}
/* If there's a cached result, return that. */
if (pw_cache_idx < pw_cache_size) {
if (ctx->pw_cache_idx < ctx->pw_cache_size) {
goto return_result;
}
/* Otherwise, query winbindd for some entries. */
pw_cache_idx = 0;
ctx->pw_cache_idx = 0;
winbindd_free_response(&pw_response);
@ -448,17 +451,17 @@ wbcErr wbcCtxGetpwent(struct wbcContext *ctx, struct passwd **pwd)
BAIL_ON_WBC_ERROR(wbc_status);
pw_cache_size = pw_response.data.num_entries;
ctx->pw_cache_size = pw_response.data.num_entries;
return_result:
wb_pw = (struct winbindd_pw *) pw_response.extra_data.data;
*pwd = copy_passwd_entry(&wb_pw[pw_cache_idx]);
*pwd = copy_passwd_entry(&wb_pw[ctx->pw_cache_idx]);
BAIL_ON_PTR_ERROR(*pwd, wbc_status);
pw_cache_idx++;
ctx->pw_cache_idx++;
done:
return wbc_status;
@ -469,16 +472,6 @@ wbcErr wbcGetpwent(struct passwd **pwd)
return wbcCtxGetpwent(NULL, pwd);
}
/** @brief Number of cached group structs
*
*/
static uint32_t gr_cache_size;
/** @brief Position of the grent context
*
*/
static uint32_t gr_cache_idx;
/** @brief Winbindd response containing the group structs
*
*/
@ -489,8 +482,12 @@ wbcErr wbcCtxSetgrent(struct wbcContext *ctx)
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
if (gr_cache_size > 0) {
gr_cache_idx = gr_cache_size = 0;
if (!ctx) {
ctx = wbcGetGlobalCtx();
}
if (ctx->gr_cache_size > 0) {
ctx->gr_cache_idx = ctx->gr_cache_size = 0;
winbindd_free_response(&gr_response);
}
@ -514,8 +511,12 @@ wbcErr wbcCtxEndgrent(struct wbcContext *ctx)
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
if (gr_cache_size > 0) {
gr_cache_idx = gr_cache_size = 0;
if (!ctx) {
ctx = wbcGetGlobalCtx();
}
if (ctx->gr_cache_size > 0) {
ctx->gr_cache_idx = ctx->gr_cache_size = 0;
winbindd_free_response(&gr_response);
}
@ -540,14 +541,18 @@ wbcErr wbcCtxGetgrent(struct wbcContext *ctx, struct group **grp)
struct winbindd_gr *wb_gr;
uint32_t mem_ofs;
if (!ctx) {
ctx = wbcGetGlobalCtx();
}
/* If there's a cached result, return that. */
if (gr_cache_idx < gr_cache_size) {
if (ctx->gr_cache_idx < ctx->gr_cache_size) {
goto return_result;
}
/* Otherwise, query winbindd for some entries. */
gr_cache_idx = 0;
ctx->gr_cache_idx = 0;
winbindd_free_response(&gr_response);
@ -559,21 +564,21 @@ wbcErr wbcCtxGetgrent(struct wbcContext *ctx, struct group **grp)
BAIL_ON_WBC_ERROR(wbc_status);
gr_cache_size = gr_response.data.num_entries;
ctx->gr_cache_size = gr_response.data.num_entries;
return_result:
wb_gr = (struct winbindd_gr *) gr_response.extra_data.data;
mem_ofs = wb_gr[gr_cache_idx].gr_mem_ofs +
gr_cache_size * sizeof(struct winbindd_gr);
mem_ofs = wb_gr[ctx->gr_cache_idx].gr_mem_ofs +
ctx->gr_cache_size * sizeof(struct winbindd_gr);
*grp = copy_group_entry(&wb_gr[gr_cache_idx],
*grp = copy_group_entry(&wb_gr[ctx->gr_cache_idx],
((char *)gr_response.extra_data.data)+mem_ofs);
BAIL_ON_PTR_ERROR(*grp, wbc_status);
gr_cache_idx++;
ctx->gr_cache_idx++;
done:
return wbc_status;
@ -591,14 +596,18 @@ wbcErr wbcCtxGetgrlist(struct wbcContext *ctx, struct group **grp)
struct winbindd_request request;
struct winbindd_gr *wb_gr;
if (!ctx) {
ctx = wbcGetGlobalCtx();
}
/* If there's a cached result, return that. */
if (gr_cache_idx < gr_cache_size) {
if (ctx->gr_cache_idx < ctx->gr_cache_size) {
goto return_result;
}
/* Otherwise, query winbindd for some entries. */
gr_cache_idx = 0;
ctx->gr_cache_idx = 0;
winbindd_free_response(&gr_response);
ZERO_STRUCT(gr_response);
@ -611,17 +620,17 @@ wbcErr wbcCtxGetgrlist(struct wbcContext *ctx, struct group **grp)
BAIL_ON_WBC_ERROR(wbc_status);
gr_cache_size = gr_response.data.num_entries;
ctx->gr_cache_size = gr_response.data.num_entries;
return_result:
wb_gr = (struct winbindd_gr *) gr_response.extra_data.data;
*grp = copy_group_entry(&wb_gr[gr_cache_idx], NULL);
*grp = copy_group_entry(&wb_gr[ctx->gr_cache_idx], NULL);
BAIL_ON_PTR_ERROR(*grp, wbc_status);
gr_cache_idx++;
ctx->gr_cache_idx++;
done:
return wbc_status;

14
nsswitch/libwbclient/wbclient.c
View File

@ -41,6 +41,15 @@ NSS_STATUS winbindd_priv_request_response(struct winbindd_context *wbctx,
struct winbindd_context *winbindd_ctx_create(void);
void winbindd_ctx_free(struct winbindd_context *ctx);
/* Global context used for non-Ctx functions */
static struct wbcContext wbcGlobalCtx = {
.winbindd_ctx = NULL,
.pw_cache_size = 0,
.pw_cache_idx = 0,
.gr_cache_size = 0,
.gr_cache_idx = 0
};
/*
result == NSS_STATUS_UNAVAIL: winbind not around
@ -317,3 +326,8 @@ void wbcCtxFree(struct wbcContext *ctx)
{
wbcFreeMemory(ctx);
}
struct wbcContext *wbcGetGlobalCtx(void)
{
return &wbcGlobalCtx;
}

5
nsswitch/libwbclient/wbclient_internal.h
View File

@ -24,6 +24,10 @@
struct wbcContext {
struct winbindd_context *winbindd_ctx;
uint32_t pw_cache_size; /* Number of cached passwd structs */
uint32_t pw_cache_idx; /* Position of the pwent context */
uint32_t gr_cache_size; /* Number of cached group structs */
uint32_t gr_cache_idx; /* Position of the grent context */
};
/* Private functions */
@ -41,5 +45,6 @@ void *wbcAllocateMemory(size_t nelem, size_t elsize,
char *wbcStrDup(const char *str);
const char **wbcAllocateStringArray(int num_strings);
struct wbcContext *wbcGetGlobalCtx(void);
#endif /* _WBCLIENT_INTERNAL_H */