applied Salmi's patch

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 836de45..12c991f 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -1,8 +1,15 @@
 /* (C)opyright MMIV-MMV Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 /* (C)opyright MMIV-MMV Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */

-#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE 500
+
+#if HAVE_SHADOW_H

 #include <shadow.h>
 #include <shadow.h>

+#else
+#include <pwd.h>
+#endif
+
+#include <ctype.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>


@@ -16,9 +23,13 @@ int
 main(int argc, char **argv) {
        char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
        char buf[32], passwd[256];
 main(int argc, char **argv) {
        char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
        char buf[32], passwd[256];

-       int num, prev_nitem, screen;
+       int num, screen;
+#if HAVE_SHADOW_H

        struct spwd *sp;
        struct spwd *sp;

-       unsigned int i, len;
+#else
+       struct passwd *pw;
+#endif
+       unsigned int len;

        Bool running = True;
        Cursor invisible;
        Display *dpy;
        Bool running = True;
        Cursor invisible;
        Display *dpy;


@@ -33,11 +44,17 @@ main(int argc, char **argv) {
                fputs("slock-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
                exit(EXIT_SUCCESS);
        }
                fputs("slock-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
                exit(EXIT_SUCCESS);
        }

-       if(!(sp = getspnam(getenv("USER")))) {
+       if(geteuid() != 0) {

                fputs("slock: cannot retrieve password entry (make sure to suid slock)\n", stderr);
                exit(EXIT_FAILURE);
        }
                fputs("slock: cannot retrieve password entry (make sure to suid slock)\n", stderr);
                exit(EXIT_FAILURE);
        }

+#if HAVE_SHADOW_H
+       sp = getspnam(getenv("USER"));

        endspent();
        endspent();

+#else
+       pw = getpwuid(getuid());
+       endpwent();
+#endif

        if(!(dpy = XOpenDisplay(0))) {
                fputs("slock: cannot open display\n", stderr);
                exit(EXIT_FAILURE);
        if(!(dpy = XOpenDisplay(0))) {
                fputs("slock: cannot open display\n", stderr);
                exit(EXIT_FAILURE);


@@ -87,7 +104,11 @@ main(int argc, char **argv) {
                        }
                        switch(ksym) {
                        case XK_Return:
                        }
                        switch(ksym) {
                        case XK_Return:

+#if HAVE_SHADOW_H

                                if((running = strncmp(crypt(passwd, sp->sp_pwdp), sp->sp_pwdp, sizeof(passwd))))
                                if((running = strncmp(crypt(passwd, sp->sp_pwdp), sp->sp_pwdp, sizeof(passwd))))

+#else
+                               if((running = strncmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd, sizeof(passwd))))
+#endif

                                        XBell(dpy, 100);
                                passwd[0] = 0;
                                break;
                                        XBell(dpy, 100);
                                passwd[0] = 0;
                                break;