fix

.hgtags

@@ -1 +1,8 @@
 0a95c73c7374fbc2342b6040d9f35ddf597729e1 0.1
+da5cb1f0a685258d5315ea109860bacbc2871a57 0.2
+f9157b1864388ad8f1920e5fde7c5849e73d8327 0.3
+4c2cf4d6a2d0e08cbe280ec50ef76c9aecfc0fbe 0.4
+bd24ea7fcca26b161225c464df23ecbfe85280e1 0.5
+dd226a81c09adfa86db232419b3000b7e406df68 0.6
+c4635bb35a4581261f0187b347d5e596dd390ca3 0.7
+c0eb8221ba49c6d10becc93c063c45196a3bb1ba 0.8

LICENSE

@@ -1,21 +1,21 @@
 MIT/X Consortium License
 
-(C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+© 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
 to deal in the Software without restriction, including without limitation
 the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the 
+and/or sell copies of the Software, and to permit persons to whom the
 Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software. 
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.

Makefile

@@ -1,5 +1,5 @@
 # slock - simple screen locker
-#   (C)opyright MMVI Anselm R. Garbe
+# © 2006-2007 Anselm R. Garbe, Sander van Dijk
 
 include config.mk
 
@@ -13,7 +13,6 @@ options:
 	@echo "CFLAGS   = ${CFLAGS}"
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
-	@echo "LD       = ${LD}"
 
 .c.o:
 	@echo CC $<
@@ -22,9 +21,8 @@ options:
 ${OBJ}: config.mk
 
 slock: ${OBJ}
-	@echo LD $@
-	@${LD} -o $@ ${OBJ} ${LDFLAGS}
-	@strip $@
+	@echo CC -o $@
+	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 clean:
 	@echo cleaning

README

@@ -13,12 +13,12 @@ Installation
 Edit config.mk to match your local setup (slock is installed into
 the /usr/local namespace by default).
 
-Afterwards enter the following command to build and install slock (if
-necessary as root):
+Afterwards enter the following command to build and install slock
+(if necessary as root):
 
     make clean install
 
 
 Running slock
 -------------
-Simply invoke the 'slock' command.
+Simply invoke the 'slock' command. To get out of it, enter your password.

config.mk

@@ -1,28 +1,30 @@
 # slock version
-VERSION = 0.2
+VERSION = 0.9
 
 # Customize below to fit your system
 
 # paths
 PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 # includes and libs
 INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11
+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext
 
 # flags
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
-LDFLAGS = ${LIBS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
-#LDFLAGS = -g ${LIBS}
+CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+LDFLAGS = -s ${LIBS}
 
-# On *BSD remove -DHAVE_SHADOW_H from CFLAGS
-# On OpenBSD remove -lcrypt from LIBS
+# On *BSD remove -DHAVE_SHADOW_H from CPPFLAGS and add -DHAVE_BSD_AUTH
+# On OpenBSD and Darwin remove -lcrypt from LIBS
 
 # compiler and linker
 CC = cc
-LD = ${CC}
+
+# Install mode. On BSD systems MODE=2755 and GROUP=auth
+# On others MODE=4755 and GROUP=root
+#MODE=2755
+#GROUP=auth

slock.c

@@ -1,15 +1,12 @@
-/* (C)opyright MMIV-MMV Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for license details. */
 #define _XOPEN_SOURCE 500
-
 #if HAVE_SHADOW_H
 #include <shadow.h>
-#else
-#include <pwd.h>
 #endif
 
 #include <ctype.h>
+#include <pwd.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -18,16 +15,59 @@
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/extensions/dpms.h>
+
+#if HAVE_BSD_AUTH
+#include <login_cap.h>
+#include <bsd_auth.h>
+#endif
+
+static void
+die(const char *errstr, ...) {
+	va_list ap;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
+}
+
+#ifndef HAVE_BSD_AUTH
+static const char *
+get_password() { /* only run as root */
+	const char *rval;
+	struct passwd *pw;
+
+	if(geteuid() != 0)
+		die("slock: cannot retrieve password entry (make sure to suid slock)\n");
+	pw = getpwuid(getuid());
+	endpwent();
+	rval =  pw->pw_passwd;
+
+#if HAVE_SHADOW_H
+	{
+		struct spwd *sp;
+		sp = getspnam(getenv("USER"));
+		endspent();
+		rval = sp->sp_pwdp;
+	}
+#endif
+
+	/* drop privileges */
+	if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
+		die("slock: cannot drop privileges\n");
+	return rval;
+}
+#endif
 
 int
 main(int argc, char **argv) {
 	char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
 	char buf[32], passwd[256];
 	int num, screen;
-#if HAVE_SHADOW_H
-	struct spwd *sp;
-#else
-	struct passwd *pw;
+
+#ifndef HAVE_BSD_AUTH
+	const char *pws;
 #endif
 	unsigned int len;
 	Bool running = True;
@@ -35,92 +75,101 @@ main(int argc, char **argv) {
 	Display *dpy;
 	KeySym ksym;
 	Pixmap pmap;
-	Window w;
+	Window root, w;
 	XColor black, dummy;
 	XEvent ev;
 	XSetWindowAttributes wa;
 
-	if((argc > 1) && !strncmp(argv[1], "-v", 3)) {
-		fputs("slock-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-		exit(EXIT_SUCCESS);
-	}
-	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();
+	if((argc == 2) && !strcmp("-v", argv[1]))
+		die("slock-"VERSION", © 2006-2008 Anselm R Garbe\n");
+	else if(argc != 1)
+		die("usage: slock [-v]\n");
+
+#ifndef HAVE_BSD_AUTH
+	pws = get_password();
 #endif
-	if(!(dpy = XOpenDisplay(0))) {
-		fputs("slock: cannot open display\n", stderr);
-		exit(EXIT_FAILURE);
-	}
+
+	if(!(dpy = XOpenDisplay(0)))
+		die("slock: cannot open display\n");
 	screen = DefaultScreen(dpy);
+	root = RootWindow(dpy, screen);
 
 	/* init */
-	passwd[0] = 0;
-
 	wa.override_redirect = 1;
 	wa.background_pixel = BlackPixel(dpy, screen);
-	w = XCreateWindow(dpy, RootWindow(dpy, screen), 0, 0,
-			DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),
+	w = XCreateWindow(dpy, root, 0, 0, DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),
 			0, DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixel, &wa);
-
 	XAllocNamedColor(dpy, DefaultColormap(dpy, screen), "black", &black, &dummy);
 	pmap = XCreateBitmapFromData(dpy, w, curs, 8, 8);
 	invisible = XCreatePixmapCursor(dpy, pmap, pmap, &black, &black, 0, 0);
 	XDefineCursor(dpy, w, invisible);
-	running = XGrabPointer(dpy, RootWindow(dpy, screen), False,
-			ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
-			GrabModeAsync, GrabModeSync, None, invisible, CurrentTime) == GrabSuccess
-		&& XGrabKeyboard(dpy, RootWindow(dpy, screen), True, GrabModeAsync,
-			 GrabModeAsync, CurrentTime) == GrabSuccess;
 	XMapRaised(dpy, w);
+	for(len = 1000; len; len--) {
+		if(XGrabPointer(dpy, root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
+			GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
+			break;
+		usleep(1000);
+	}
+	if((running = running && (len > 0))) {
+		for(len = 1000; len; len--) {
+			if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+				== GrabSuccess)
+				break;
+			usleep(1000);
+		}
+		running = (len > 0);
+	}
+	len = 0;
 	XSync(dpy, False);
 
 	/* main event loop */
-	while(running && !XNextEvent(dpy, &ev))
+	while(running && !XNextEvent(dpy, &ev)) {
+		if(len == 0 && DPMSCapable(dpy)) {
+			DPMSEnable(dpy);
+			DPMSForceLevel(dpy, DPMSModeOff);
+		}
 		if(ev.type == KeyPress) {
-			len = strlen(passwd);
 			buf[0] = 0;
-			num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);
+			num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
+			if(IsKeypadKey(ksym)) {
+				if(ksym == XK_KP_Enter)
+					ksym = XK_Return;
+				else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
+					ksym = (ksym - XK_KP_0) + XK_0;
+			}
 			if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
 					|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
 					|| IsPrivateKeypadKey(ksym))
 				continue;
 			switch(ksym) {
 			case XK_Return:
-#if HAVE_SHADOW_H
-				if((running = strncmp(crypt(passwd, sp->sp_pwdp), sp->sp_pwdp, sizeof(passwd))))
+				passwd[len] = 0;
+#ifdef HAVE_BSD_AUTH
+				running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
 #else
-				if((running = strncmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd, sizeof(passwd))))
+				running = strcmp(crypt(passwd, pws), pws);
 #endif
+				if (running != 0)
 					XBell(dpy, 100);
-				passwd[0] = 0;
+				len = 0;
 				break;
 			case XK_Escape:
-				passwd[0] = 0;
+				len = 0;
 				break;
 			case XK_BackSpace:
 				if(len)
-					passwd[--len] = 0;
+					--len;
 				break;
 			default:
-				if(num && !iscntrl((int) buf[0])) {
-					buf[num] = 0;
-					if(len)
-						strncat(passwd, buf, sizeof(passwd));
-					else
-						strncpy(passwd, buf, sizeof(passwd));
+				if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) { 
+					memcpy(passwd + len, buf, num);
+					len += num;
 				}
 				break;
 			}
 		}
+	}
 	XUngrabPointer(dpy, CurrentTime);
 	XFreePixmap(dpy, pmap);
 	XDestroyWindow(dpy, w);