d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a horrible bug introduced by myself where the options collection

Browse Source 
keeps on growing as the module stack is parsed.
This commit is contained in:
Mark Murray 2001-07-10 16:59:30 +00:00
parent ecab3d453e
commit 84f39079c5
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libpam/libpam/pam_mod_misc.h
View File

@ -37,7 +37,7 @@ enum opt { PAM_OPT_DEBUG, PAM_OPT_NO_WARN, PAM_OPT_ECHO_PASS,
PAM_OPT_USE_FIRST_PASS, PAM_OPT_TRY_FIRST_PASS, PAM_OPT_USE_MAPPED_PASS,
PAM_OPT_EXPOSE_ACCOUNT, PAM_OPT_STD_MAX /* XXX */ };
#define PAM_MAX_OPTIONS 20
#define PAM_MAX_OPTIONS 32
struct opttab {
const char *name;

27
lib/libpam/libpam/pam_std_option.c
View File

@ -35,7 +35,7 @@
/* Everyone has to have these options. It is not an error to
* specify them and then not use them.
*/
static struct opttab std_options[PAM_MAX_OPTIONS] = {
struct opttab std_options[PAM_MAX_OPTIONS] = {
{ "debug", PAM_OPT_DEBUG },
{ "no_warn", PAM_OPT_NO_WARN },
{ "echo_pass", PAM_OPT_ECHO_PASS },
@ -56,20 +56,29 @@ pam_std_option(struct options *options, struct opttab other_options[],
j = 0;
for (i = 0; i < PAM_MAX_OPTIONS; i++) {
options->opt[i].bool = 0;
options->opt[i].arg = NULL;
if (j == 0 && std_options[i].name == NULL)
if (std_options[i].name == NULL) {
j = i;
break;
}
/* XXX Bad juju happens if loop exits with j == 0 */
}
if (other_options)
for (oo = other_options; oo->name != NULL; oo++) {
if (oo == NULL || oo->name == NULL)
break;
std_options[j].name = oo->name;
std_options[j].value = oo->value;
j++;
found = 0;
for (i = 0; std_options[i].name; i++)
if (strcmp((char *)oo->name,
std_options[i].name) == 0)
found = 1;
if (!found) {
std_options[j].name = oo->name;
std_options[j].value = oo->value;
j++;
}
}
for (i = 0; i < PAM_MAX_OPTIONS; i++) {
options->opt[i].bool = 0;
options->opt[i].arg = NULL;
}
if (j < PAM_MAX_OPTIONS) {
std_options[j].name = NULL;
std_options[j].value = 0;

2
lib/libpam/libpam/security/pam_mod_misc.h
View File

@ -37,7 +37,7 @@ enum opt { PAM_OPT_DEBUG, PAM_OPT_NO_WARN, PAM_OPT_ECHO_PASS,
PAM_OPT_USE_FIRST_PASS, PAM_OPT_TRY_FIRST_PASS, PAM_OPT_USE_MAPPED_PASS,
PAM_OPT_EXPOSE_ACCOUNT, PAM_OPT_STD_MAX /* XXX */ };
#define PAM_MAX_OPTIONS 20
#define PAM_MAX_OPTIONS 32
struct opttab {
const char *name;