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

Rename getpw() and pws to gethash() and hash

This commit is contained in:
FRIGN 2016-09-11 23:10:57 +02:00 committed by Markus Teich
parent b00f444a4e
commit 9a617db716
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
slock.c
View File

@ -85,9 +85,9 @@ dontkillme(void)
#endif #endif
static const char * static const char *
getpw(void) gethash(void)
{ {
const char *rval; const char *hash;
struct passwd *pw; struct passwd *pw;
/* Check if the current user has a password entry */ /* Check if the current user has a password entry */
@ -98,35 +98,35 @@ getpw(void)
else else
die("slock: cannot retrieve password entry\n"); die("slock: cannot retrieve password entry\n");
} }
rval = pw->pw_passwd; hash = pw->pw_passwd;
#if HAVE_SHADOW_H #if HAVE_SHADOW_H
if (rval[0] == 'x' && rval[1] == '\0') { if (hash[0] == 'x' && hash[1] == '\0') {
struct spwd *sp; struct spwd *sp;
if (!(sp = getspnam(getenv("USER")))) if (!(sp = getspnam(getenv("USER"))))
die("slock: getspnam: cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); die("slock: getspnam: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
rval = sp->sp_pwdp; hash = sp->sp_pwdp;
} }
#else #else
if (rval[0] == '*' && rval[1] == '\0') { if (hash[0] == '*' && hash[1] == '\0') {
#ifdef __OpenBSD__ #ifdef __OpenBSD__
if (!(pw = getpwnam_shadow(getenv("USER")))) if (!(pw = getpwnam_shadow(getenv("USER"))))
die("slock: getpwnam_shadow: cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); die("slock: getpwnam_shadow: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
rval = pw->pw_passwd; hash = pw->pw_passwd;
#else #else
die("slock: getpwuid: cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); die("slock: getpwuid: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
#endif /* __OpenBSD__ */ #endif /* __OpenBSD__ */
} }
#endif /* HAVE_SHADOW_H */ #endif /* HAVE_SHADOW_H */
return rval; return hash;
} }
static void static void
readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
const char *pws) const char *hash)
{ {
char buf[32], passwd[256], *encrypted; char buf[32], passwd[256], *inputhash;
int num, screen, running, failure; int num, screen, running, failure;
unsigned int len, color; unsigned int len, color;
KeySym ksym; KeySym ksym;
@ -161,10 +161,10 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
case XK_Return: case XK_Return:
passwd[len] = 0; passwd[len] = 0;
errno = 0; errno = 0;
if (!(encrypted = crypt(passwd, pws))) if (!(inputhash = crypt(passwd, hash)))
fprintf(stderr, "slock: crypt: %s\n", strerror(errno)); fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
else else
running = !!strcmp(encrypted, pws); running = !!strcmp(inputhash, hash);
if (running) { if (running) {
XBell(dpy, 100); XBell(dpy, 100);
failure = True; failure = True;
@ -292,7 +292,7 @@ main(int argc, char **argv) {
struct group *grp; struct group *grp;
uid_t duid; uid_t duid;
gid_t dgid; gid_t dgid;
const char *pws; const char *hash;
Display *dpy; Display *dpy;
int s, nlocks, nscreens; int s, nlocks, nscreens;
@ -320,8 +320,8 @@ main(int argc, char **argv) {
dontkillme(); dontkillme();
#endif #endif
pws = getpw(); hash = gethash();
if (strlen(pws) < 2) if (strlen(hash) < 2)
die("slock: failed to get user password hash.\n"); die("slock: failed to get user password hash.\n");
if (!(dpy = XOpenDisplay(NULL))) if (!(dpy = XOpenDisplay(NULL)))
@ -370,7 +370,7 @@ main(int argc, char **argv) {
} }
/* everything is now blank. Wait for the correct password */ /* everything is now blank. Wait for the correct password */
readpw(dpy, &rr, locks, nscreens, pws); readpw(dpy, &rr, locks, nscreens, hash);
return 0; return 0;
} }