mirrors/pam-modules
1
0
Fork 0
mirror of git://git.gnu.org.ua/pam-modules.git synced 2025-04-28 01:19:53 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

* lib/parseopt.c: New file.

Browse source 
* lib/Makefile.am (libgraypam_la_SOURCES): Add parseopt.c
* lib/graypam.h (gray_parseopt, gray_wait_debug_fun): New
functions
(CNTL_DEBUG_LEV, CNTL_SET_DEBUG_LEV): Removed.
* lib/log.c (gray_wait_debug): New functions.
* pam_fshadow/pam_fshadow.c, pam_sql/pam_sql.c,
pam_regex/pam_regex.c, pam_log/pam_log.c: Use gray_parseopt for
command line parsing.



git-svn-id: file:///svnroot/pam-modules/trunk@67 56984be4-0537-0410-a56c-fcb268c96130
This commit is contained in:
Sergey Poznyakoff 2008-03-14 12:50:10 +00:00
parent 8600d3bc0e
commit 1128870a98
9 changed files with 359 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

94
pam_regex/pam_regex.c
View file

@ -39,81 +39,54 @@
#include <security/pam_modules.h>
#define CNTL_AUTHTOK 0x0010
#define CNTL_REGEX_FLAGS 0x0012
#define SENSE_ALLOW 0
#define SENSE_DENY 1
const char *sense_choice[] = { "allow", "deny", NULL };
static int sense;
static int cntl_flags;
static long debug_level;
static const char *regex = NULL;
static int regex_flags = REG_NOSUB;
static int regex_flags = REG_NOSUB|REG_EXTENDED;
static const char *transform = NULL;
static const char *user_name;
struct pam_opt pam_opt[] = {
{ PAM_OPTSTR(debug), pam_opt_long, &debug_level },
{ PAM_OPTSTR(debug), pam_opt_const, &debug_level, 1 },
{ PAM_OPTSTR(audit), pam_opt_bitmask, &cntl_flags, CNTL_AUDIT },
{ PAM_OPTSTR(waitdebug), pam_opt_null, NULL, 0, gray_wait_debug_fun },
{ PAM_OPTSTR(use_authtok), pam_opt_bitmask, &cntl_flags,
CNTL_AUTHTOK },
{ PAM_OPTSTR(sense), pam_opt_enum, &sense, sense_choice },
{ PAM_OPTSTR(transform), pam_opt_string, &transform },
{ PAM_OPTSTR(user_name), pam_opt_string, &user_name },
{ PAM_OPTSTR(regex), pam_opt_string, &regex },
{ PAM_OPTSTR(extended), pam_opt_bitmask, &regex_flags,
REG_EXTENDED },
{ PAM_OPTSTR(basic), pam_opt_bitmask_rev, &regex_flags,
REG_EXTENDED },
{ PAM_OPTSTR(icase), pam_opt_bitmask, &regex_flags,
REG_ICASE },
{ PAM_OPTSTR(ignore-case), pam_opt_bitmask, &regex_flags,
REG_ICASE },
{ PAM_OPTSTR(case), pam_opt_bitmask_rev, &regex_flags,
REG_ICASE },
{ NULL }
};
static void
_pam_parse(pam_handle_t *pamh, int argc, const char **argv)
{
int ctrl = 0;
gray_log_init(0, MODULE_NAME, LOG_AUTHPRIV);
/* step through arguments */
for (; argc-- > 0; ++argv) {
/* generic options */
if (!strncmp(*argv, "debug", 5)) {
ctrl |= CNTL_DEBUG;
if ((*argv)[5] == '=')
CNTL_SET_DEBUG_LEV(ctrl, atoi(*argv + 6));
else
CNTL_SET_DEBUG_LEV(ctrl, 1);
} else if (!strcmp(*argv, "audit"))
ctrl |= CNTL_AUDIT;
else if (!strncmp(*argv, "waitdebug", 9))
WAITDEBUG(*argv + 9);
else if (!strcmp(*argv, "use_authtok"))
ctrl |= CNTL_AUTHTOK;
else if (!strncmp(*argv, "sense=", 6)) {
if (strcmp(*argv + 6, "deny") == 0)
sense = SENSE_DENY;
else if (strcmp(*argv + 6, "allow") == 0)
sense = SENSE_ALLOW;
else
_pam_log(LOG_ERR,"unknown sense value: %s",
*argv + 6);
} else if (!strncmp(*argv, "transform=", 10))
transform = *argv + 10;
else if (!strncmp(*argv, "user=",5))
user_name = *argv + 5;
else if (!strncmp(*argv, "regex=", 6))
regex = *argv + 6;
else if (!strcmp(*argv, "extended")) {
regex_flags |= REG_EXTENDED;
ctrl |= CNTL_REGEX_FLAGS;
} else if (!strcmp(*argv, "basic")) {
regex_flags &= ~REG_EXTENDED;
ctrl |= CNTL_REGEX_FLAGS;
} else if (!strcmp(*argv, "icase")
|| !strcmp(*argv, "ignore-case")) {
regex_flags |= REG_ICASE;
ctrl |= CNTL_REGEX_FLAGS;
} else if (!strcmp(*argv, "case")) {
regex_flags &= ~REG_ICASE;
ctrl |= CNTL_REGEX_FLAGS;
} else {
_pam_log(LOG_ERR,
"unknown option: %s", *argv);
}
}
if (!regex)
_pam_log(LOG_ERR, "regex not specified");
gray_parseopt(pam_opt, argc, argv);
if (!regex && !transform)
_pam_log(LOG_ERR, "neither regex nor transform are specified");
if (user_name && transform)
_pam_log(LOG_ERR, "Both `user' and `transform' are given");
if (!(ctrl & CNTL_REGEX_FLAGS))
regex_flags |= REG_EXTENDED;
cntl_flags = ctrl;
}
/*
@ -141,9 +114,6 @@ pam_sm_authenticate(pam_handle_t *pamh,
DEBUG(100,("enter pam_sm_authenticate"));
if (!regex)
return PAM_AUTHINFO_UNAVAIL;
gray_pam_init(PAM_AUTHINFO_UNAVAIL);
/*