mirror of git://git.musl-libc.org/musl
shadow password fixes: empty fields should read as -1 not 0
This commit is contained in:
parent
b052f13cd1
commit
18bca57510
|
@ -1,6 +1,7 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
#include <ctype.h>
|
||||||
#include "pwf.h"
|
#include "pwf.h"
|
||||||
|
|
||||||
/* This implementation support Openwall-style TCB passwords in place of
|
/* This implementation support Openwall-style TCB passwords in place of
|
||||||
|
@ -10,6 +11,11 @@
|
||||||
* file. It also avoids any allocation to prevent memory-exhaustion
|
* file. It also avoids any allocation to prevent memory-exhaustion
|
||||||
* attacks via huge TCB shadow files. */
|
* 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)
|
int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct spwd **res)
|
||||||
{
|
{
|
||||||
char path[20+NAME_MAX];
|
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;
|
*s++ = 0; sp->sp_pwdp = s;
|
||||||
if (!(s = strchr(s, ':'))) continue;
|
if (!(s = strchr(s, ':'))) continue;
|
||||||
|
|
||||||
*s++ = 0; sp->sp_lstchg = atol(s);
|
*s++ = 0; sp->sp_lstchg = xatol(s);
|
||||||
if (!(s = strchr(s, ':'))) continue;
|
if (!(s = strchr(s, ':'))) continue;
|
||||||
|
|
||||||
*s++ = 0; sp->sp_min = atol(s);
|
*s++ = 0; sp->sp_min = xatol(s);
|
||||||
if (!(s = strchr(s, ':'))) continue;
|
if (!(s = strchr(s, ':'))) continue;
|
||||||
|
|
||||||
*s++ = 0; sp->sp_max = atol(s);
|
*s++ = 0; sp->sp_max = xatol(s);
|
||||||
if (!(s = strchr(s, ':'))) continue;
|
if (!(s = strchr(s, ':'))) continue;
|
||||||
|
|
||||||
*s++ = 0; sp->sp_warn = atol(s);
|
*s++ = 0; sp->sp_warn = xatol(s);
|
||||||
if (!(s = strchr(s, ':'))) continue;
|
if (!(s = strchr(s, ':'))) continue;
|
||||||
|
|
||||||
*s++ = 0; sp->sp_inact = atol(s);
|
*s++ = 0; sp->sp_inact = xatol(s);
|
||||||
if (!(s = strchr(s, ':'))) continue;
|
if (!(s = strchr(s, ':'))) continue;
|
||||||
|
|
||||||
*s++ = 0; sp->sp_expire = atol(s);
|
*s++ = 0; sp->sp_expire = xatol(s);
|
||||||
if (!(s = strchr(s, ':'))) continue;
|
if (!(s = strchr(s, ':'))) continue;
|
||||||
|
|
||||||
*s++ = 0; sp->sp_flag = atol(s);
|
*s++ = 0; sp->sp_flag = xatol(s);
|
||||||
*res = sp;
|
*res = sp;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue