diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-04-20 19:05:59 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-04-20 19:05:59 -0400 |
| commit | 18bca575107d80ca81241d1429ded62918c5bd2e (patch) | |
| tree | a47d1edd7ef482d5a4f628dc6ea2ec187f7c3e95 | |
| parent | b052f13cd1215cf444f16ccf14c96e32f61f73e0 (diff) | |
| download | musl-18bca575107d80ca81241d1429ded62918c5bd2e.zip musl-18bca575107d80ca81241d1429ded62918c5bd2e.tar.gz musl-18bca575107d80ca81241d1429ded62918c5bd2e.tar.bz2 | |
shadow password fixes: empty fields should read as -1 not 0
| -rw-r--r-- | src/passwd/getspnam_r.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/passwd/getspnam_r.c b/src/passwd/getspnam_r.c index d21ca81..9e29aa9 100644 --- a/src/passwd/getspnam_r.c +++ b/src/passwd/getspnam_r.c @@ -1,6 +1,7 @@ #include <fcntl.h> #include <unistd.h> #include <sys/stat.h> +#include <ctype.h> #include "pwf.h" /* This implementation support Openwall-style TCB passwords in place of @@ -10,6 +11,11 @@ * file. It also avoids any allocation to prevent memory-exhaustion * attacks via huge TCB shadow files. */ +static long xatol(const char *s) +{ + return isdigit(*s) ? atol(s) : -1; +} + int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct spwd **res) { char path[20+NAME_MAX]; @@ -64,25 +70,25 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct *s++ = 0; sp->sp_pwdp = s; if (!(s = strchr(s, ':'))) continue; - *s++ = 0; sp->sp_lstchg = atol(s); + *s++ = 0; sp->sp_lstchg = xatol(s); if (!(s = strchr(s, ':'))) continue; - *s++ = 0; sp->sp_min = atol(s); + *s++ = 0; sp->sp_min = xatol(s); if (!(s = strchr(s, ':'))) continue; - *s++ = 0; sp->sp_max = atol(s); + *s++ = 0; sp->sp_max = xatol(s); if (!(s = strchr(s, ':'))) continue; - *s++ = 0; sp->sp_warn = atol(s); + *s++ = 0; sp->sp_warn = xatol(s); if (!(s = strchr(s, ':'))) continue; - *s++ = 0; sp->sp_inact = atol(s); + *s++ = 0; sp->sp_inact = xatol(s); if (!(s = strchr(s, ':'))) continue; - *s++ = 0; sp->sp_expire = atol(s); + *s++ = 0; sp->sp_expire = xatol(s); if (!(s = strchr(s, ':'))) continue; - *s++ = 0; sp->sp_flag = atol(s); + *s++ = 0; sp->sp_flag = xatol(s); *res = sp; break; } |