X-Git-Url: https://git.xinqibao.xyz/slock.git/blobdiff_plain/2fa12210c9b6795f51a3227aaf417afe7f94fbce..9fa696d6c13e64b5bdc9dd01e4965eccec4b23cf:/slock.c

diff --git a/slock.c b/slock.c
index 836de45..0f4c3cc 100644
--- 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.
  */
-#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE 500
+
+#if HAVE_SHADOW_H
 #include <shadow.h>
+#else
+#include <pwd.h>
+#endif
+
+#include <ctype.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];
-	int num, prev_nitem, screen;
+	int num, screen;
+#if HAVE_SHADOW_H
 	struct spwd *sp;
-	unsigned int i, len;
+#else
+	struct passwd *pw;
+#endif
+	unsigned int len;
 	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);
 	}
-	if(!(sp = getspnam(getenv("USER")))) {
+	if(geteuid() != 0) {
 		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();
+#else
+	pw = getpwuid(getuid());
+	endpwent();
+#endif
 	if(!(dpy = XOpenDisplay(0))) {
 		fputs("slock: cannot open display\n", stderr);
 		exit(EXIT_FAILURE);
@@ -74,20 +91,13 @@ main(int argc, char **argv) {
 					|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
 					|| IsPrivateKeypadKey(ksym))
 				continue;
-			/* first check if a control mask is omitted */
-			if(ev.xkey.state & ControlMask) {
-				switch (ksym) {
-				case XK_h:
-				case XK_H: ksym = XK_BackSpace;
-					break;
-				case XK_u:
-				case XK_U: passwd[0] = 0;
-					continue;
-				}
-			}
 			switch(ksym) {
 			case XK_Return:
+#if HAVE_SHADOW_H
 				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;