remove confusing DPMS comment

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index f423f8c..c81f5dd 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -85,9 +85,9 @@ dontkillme(void)
 #endif
 
 static const char *
 #endif
 
 static const char *

-getpw(void)
+gethash(void)

 {
 {

-       const char *rval;
+       const char *hash;

        struct passwd *pw;
 
        /* Check if the current user has a password entry */
        struct passwd *pw;
 
        /* Check if the current user has a password entry */


@@ -98,35 +98,35 @@ getpw(void)
                else
                        die("slock: cannot retrieve password entry\n");
        }
                else
                        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(pw->pw_name)))

                        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 = getpwuid_shadow(getuid())))

                        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
                die("slock: getpwuid: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
 #endif /* __OpenBSD__ */
        }
 #endif /* HAVE_SHADOW_H */
 
 #else
                die("slock: getpwuid: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
 #endif /* __OpenBSD__ */
        }
 #endif /* HAVE_SHADOW_H */
 

-       return rval;
+       return hash;

 }
 
 static void
 readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 }
 
 static void
 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;
        unsigned int len, color;
        KeySym ksym;
        int num, screen, running, failure;
        unsigned int len, color;
        KeySym ksym;


@@ -137,10 +137,6 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
        running = 1;
        failure = 0;
 
        running = 1;
        failure = 0;
 

-       /* As "slock" stands for "Simple X display locker", the DPMS settings
-        * had been removed and you can set it with "xset" or some other
-        * utility. This way the user can easily set a customized DPMS
-        * timeout. */

        while (running && !XNextEvent(dpy, &ev)) {
                if (ev.type == KeyPress) {
                        explicit_bzero(&buf, sizeof(buf));
        while (running && !XNextEvent(dpy, &ev)) {
                if (ev.type == KeyPress) {
                        explicit_bzero(&buf, sizeof(buf));


@@ -161,10 +157,10 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
                        case XK_Return:
                                passwd[len] = 0;
                                errno = 0;
                        case XK_Return:
                                passwd[len] = 0;
                                errno = 0;

-                               if (!(encrypted = crypt(passwd, pws)))
+                               if (!(inputhash = crypt(passwd, hash)))

                                        fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
                                else
                                        fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
                                else

-                                       running = !!strcmp(encrypted, pws);
+                                       running = !!strcmp(inputhash, hash);

                                if (running) {
                                        XBell(dpy, 100);
                                        failure = True;
                                if (running) {
                                        XBell(dpy, 100);
                                        failure = True;


@@ -292,7 +288,7 @@ main(int argc, char **argv) {
        struct group *grp;
        uid_t duid;
        gid_t dgid;
        struct group *grp;
        uid_t duid;
        gid_t dgid;

-       const char *pws;
+       const char *hash;

        Display *dpy;
        int s, nlocks, nscreens;
 
        Display *dpy;
        int s, nlocks, nscreens;
 


@@ -320,9 +316,10 @@ main(int argc, char **argv) {
        dontkillme();
 #endif
 
        dontkillme();
 #endif
 

-       pws = getpw();
-       if (strlen(pws) < 2)
-               die("slock: failed to get user password hash.\n");
+       hash = gethash();
+       errno = 0;
+       if (!crypt("", hash))
+               die("slock: crypt: %s\n", strerror(errno));

 
        if (!(dpy = XOpenDisplay(NULL)))
                die("slock: cannot open display\n");
 
        if (!(dpy = XOpenDisplay(NULL)))
                die("slock: cannot open display\n");


@@ -370,7 +367,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;
 }