diff options
| author | Andrew G. Morgan <morgan@kernel.org> | 2000-11-26 07:40:04 +0000 |
|---|---|---|
| committer | Andrew G. Morgan <morgan@kernel.org> | 2000-11-26 07:40:04 +0000 |
| commit | 694de6b285023c21189ed9fd0095777c5e890819 (patch) | |
| tree | a3d4ab9953f85cda74f5bf86172e1acf7d516940 | |
| parent | 6b6fbdbcf1fe84f6b82fe71c178cb6466f76f5e3 (diff) | |
| download | pam-694de6b285023c21189ed9fd0095777c5e890819.tar.gz pam-694de6b285023c21189ed9fd0095777c5e890819.tar.bz2 pam-694de6b285023c21189ed9fd0095777c5e890819.zip | |
Relevant BUGIDs: 112906
Purpose of commit: bugfix
Commit summary:
---------------
removed static variable from pam_wheel module.
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | modules/pam_wheel/pam_wheel.c | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -35,6 +35,8 @@ Where you should replace XXXXX with a bug-id. 0.73: please submit patches for this section with actual code/doc patches! +* removed static variable from pam_wheel (module should be thread safe + now). (Bug 112906 - agmorgan) * added support for '/' symbols in pam_time and pam_group config files (support for modern terminal devices). Fixed infinite loop problem with '\\[^\n]' in these files. (Bug 116076 - agmorgan) diff --git a/modules/pam_wheel/pam_wheel.c b/modules/pam_wheel/pam_wheel.c index 417fa5b8..add72bc4 100644 --- a/modules/pam_wheel/pam_wheel.c +++ b/modules/pam_wheel/pam_wheel.c @@ -43,9 +43,6 @@ #include <security/pam_modules.h> -/* variables */ -static char use_group[BUFSIZ]; - /* some syslogging */ static void _pam_log(int err, const char *format, ...) @@ -78,7 +75,7 @@ static int is_on_list(char * const *list, const char *member) #define PAM_TRUST_ARG 0x0004 #define PAM_DENY_ARG 0x0010 -static int _pam_parse(int argc, const char **argv) +static int _pam_parse(int argc, const char **argv, char *use_group) { int ctrl=0; @@ -118,11 +115,12 @@ int pam_sm_authenticate(pam_handle_t *pamh,int flags,int argc struct passwd *pwd, *tpwd; struct group *grp; int retval = PAM_AUTH_ERR; + char use_group[BUFSIZ]; /* Init the optional group */ - bzero(use_group,sizeof(use_group)); + bzero(use_group,BUFSIZ); - ctrl = _pam_parse(argc, argv); + ctrl = _pam_parse(argc, argv, use_group); retval = pam_get_user(pamh,&username,NULL); if ((retval != PAM_SUCCESS) || (!username)) { if (ctrl & PAM_DEBUG_ARG) |