diff options
| author | Thorsten Kukuk <kukuk@thkukuk.de> | 2004-09-15 09:14:28 +0000 |
|---|---|---|
| committer | Thorsten Kukuk <kukuk@thkukuk.de> | 2004-09-15 09:14:28 +0000 |
| commit | d7987be1aade2b11454a8b3b3d8e9c1c3df93d5f (patch) | |
| tree | e2d0899b90a73ecccafe72f01c9aa09180767ef2 /modules | |
| parent | 0b3e58307f210514609115544899ebe42d57a5c9 (diff) | |
Relevant BUGIDs:
Purpose of commit:
Commit summary:
---------------
bugfix: First round of Linux distributor patch merges
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/pam_cracklib/pam_cracklib.c | 1 | ||||
| -rw-r--r-- | modules/pam_group/pam_group.c | 2 | ||||
| -rw-r--r-- | modules/pam_issue/pam_issue.c | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/modules/pam_cracklib/pam_cracklib.c b/modules/pam_cracklib/pam_cracklib.c index ff2c61f9..84eae9fb 100644 --- a/modules/pam_cracklib/pam_cracklib.c +++ b/modules/pam_cracklib/pam_cracklib.c @@ -559,6 +559,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, D(("called.")); + memset(&options, 0, sizeof(options)); options.retry_times = CO_RETRY_TIMES; options.diff_ok = CO_DIFF_OK; options.diff_ignore = CO_DIFF_IGNORE; diff --git a/modules/pam_group/pam_group.c b/modules/pam_group/pam_group.c index 4f6f34fb..77c909d0 100644 --- a/modules/pam_group/pam_group.c +++ b/modules/pam_group/pam_group.c @@ -771,7 +771,7 @@ PAM_EXTERN int pam_sm_setcred(pam_handle_t *pamh, int flags /* only interested in establishing credentials */ setting = flags; - if (!(setting & PAM_ESTABLISH_CRED)) { + if (!(setting & (PAM_ESTABLISH_CRED | PAM_REINITIALIZE_CRED))) { D(("ignoring call - not for establishing credentials")); return PAM_SUCCESS; /* don't fail because of this */ } diff --git a/modules/pam_issue/pam_issue.c b/modules/pam_issue/pam_issue.c index 67f40c85..985bfebc 100644 --- a/modules/pam_issue/pam_issue.c +++ b/modules/pam_issue/pam_issue.c @@ -38,7 +38,7 @@ static int _user_prompt_set = 0; -char *do_prompt (FILE *); +static char *do_prompt (FILE *); /* --- authentication management functions (only) --- */ @@ -130,7 +130,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, { char *prompt_tmp_tmp = prompt_tmp; - prompt_tmp = realloc(prompt_tmp, tot_size); + prompt_tmp = realloc(prompt_tmp, tot_size + 1); if (prompt_tmp == NULL) { prompt_tmp = prompt_tmp_tmp; retval = PAM_IGNORE; @@ -164,7 +164,7 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, return PAM_IGNORE; } -char *do_prompt(FILE *fd) +static char *do_prompt(FILE *fd) { int c, size = 1024; char *issue = (char *)malloc(size); |