summaryrefslogtreecommitdiff
path: root/modules/pam_pwhistory
diff options
context:
space:
mode:
authorTomas Mraz <tmraz@fedoraproject.org>2014-07-21 16:31:38 +0200
committerTomas Mraz <tmraz@fedoraproject.org>2014-07-21 16:37:22 +0200
commitd65f138fbc784911399e5afe66c9661e0136b43d (patch)
treeb8eedc6021e751b4a280b0361eabf5fde21ca02a /modules/pam_pwhistory
parenta31da1e8b443cbd74bfd51381897b0427719a8d1 (diff)
Make pam_pwhistory and pam_unix tolerant of corrupted opasswd file.
* modules/pam_pwhistory/opasswd.c (parse_entry): Test for missing fields in opasswd entry and return error. * modules/pam_unix/passverify.c (save_old_password): Test for missing fields in opasswd entry and skip it.
Diffstat (limited to 'modules/pam_pwhistory')
-rw-r--r--modules/pam_pwhistory/opasswd.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c
index 836d713e..e6cf3469 100644
--- a/modules/pam_pwhistory/opasswd.c
+++ b/modules/pam_pwhistory/opasswd.c
@@ -82,10 +82,15 @@ parse_entry (char *line, opwd *data)
{
const char delimiters[] = ":";
char *endptr;
+ char *count;
data->user = strsep (&line, delimiters);
data->uid = strsep (&line, delimiters);
- data->count = strtol (strsep (&line, delimiters), &endptr, 10);
+ count = strsep (&line, delimiters);
+ if (count == NULL)
+ return 1;
+
+ data->count = strtol (count, &endptr, 10);
if (endptr != NULL && *endptr != '\0')
return 1;