public
/
slock-bgimage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add /etc/passwd support 

Fix slock to work with /etc/passwd without /etc/shadow.
while we're at it, remove an occurence of trailing whitespace.
This commit is contained in:
FRIGN 2014-06-03 19:19:10 +02:00 committed by sin
parent 6a55128354
commit 9db14b10dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slock.c
View File

@ -75,7 +75,7 @@ getpw(void) { /* only run as root */
rval = pw->pw_passwd; rval = pw->pw_passwd;
#if HAVE_SHADOW_H #if HAVE_SHADOW_H
if (strlen(rval) >= 1) { /* kludge, assumes pw placeholder entry has len >= 1 */ if (rval[0] == 'x' && rval[1] == '\0') {
struct spwd *sp; struct spwd *sp;
sp = getspnam(getenv("USER")); sp = getspnam(getenv("USER"));
if(!sp) if(!sp)
@ -147,7 +147,7 @@ readpw(Display *dpy, const char *pws)
--len; --len;
break; break;
default: default:
if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) { if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) {
memcpy(passwd + len, buf, num); memcpy(passwd + len, buf, num);
len += num; len += num;
} }