applied two patches, BSD_AUTH patch and Gottox' DPMS support patch

.hgtags

@@ -3,3 +3,5 @@ da5cb1f0a685258d5315ea109860bacbc2871a57 0.2
 f9157b1864388ad8f1920e5fde7c5849e73d8327 0.3
 4c2cf4d6a2d0e08cbe280ec50ef76c9aecfc0fbe 0.4
 bd24ea7fcca26b161225c464df23ecbfe85280e1 0.5
+dd226a81c09adfa86db232419b3000b7e406df68 0.6
+c4635bb35a4581261f0187b347d5e596dd390ca3 0.7

LICENSE

@@ -1,6 +1,6 @@
 MIT/X Consortium License
 
-(C)opyright MMVI-MMVII 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"),

Makefile

@@ -1,5 +1,5 @@
 # slock - simple screen locker
-#   (C)opyright MMVI-MMVII Anselm R. Garbe
+# © 2006-2007 Anselm R. Garbe, Sander van Dijk
 
 include config.mk
 

README

@@ -21,4 +21,4 @@ necessary as root):
 
 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,32 @@
 # slock version
-VERSION = 0.6
+VERSION = 0.8
 
 # 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
+CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"  -DHAVE_SHADOW_H
 LDFLAGS = ${LIBS}
 #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
 #LDFLAGS = -g ${LIBS}
 
-# On *BSD remove -DHAVE_SHADOW_H from CFLAGS
+# On *BSD remove -DHAVE_SHADOW_H from CFLAGS 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,6 +1,5 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
+/* © 2006-2008 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>
@@ -8,6 +7,7 @@
 
 #include <ctype.h>
 #include <pwd.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -16,16 +16,31 @@
 #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
+
+void
+eprint(const char *errstr, ...) {
+	va_list ap;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
+}
+
+#ifndef HAVE_BSD_AUTH
 const char *
 get_password() { /* only run as root */
 	const char *rval;
 	struct passwd *pw;
 
-	if(geteuid() != 0) {
+	if(geteuid() != 0)
-		fputs("slock: cannot retrieve password entry (make sure to suid slock)\n", stderr);
+		eprint("slock: cannot retrieve password entry (make sure to suid slock)\n");
-		exit(EXIT_FAILURE);
-	}
 	pw = getpwuid(getuid());
 	endpwent();
 	rval =  pw->pw_passwd;
@@ -38,20 +53,23 @@ get_password() { /* only run as root */
 		rval = sp->sp_pwdp;
 	}
 #endif
+
 	/* drop privileges */
-	if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0) {
+	if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
-		fputs("slock: cannot drop privileges\n",stdout);
+		eprint("slock: cannot drop privileges\n");
-		exit(EXIT_FAILURE);
-	}
 	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;
+
+#ifndef HAVE_BSD_AUTH
 	const char *pws;
+#endif
 	unsigned int len;
 	Bool running = True;
 	Cursor invisible;
@@ -63,15 +81,17 @@ main(int argc, char **argv) {
 	XEvent ev;
 	XSetWindowAttributes wa;
 
-	if((argc > 1) && !strncmp(argv[1], "-v", 3)) {
+	if((argc == 2) && !strcmp("-v", argv[1]))
-		fputs("slock-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+		eprint("slock-"VERSION", © 2006-2008 Anselm R Garbe\n");
-		exit(EXIT_SUCCESS);
+	else if(argc != 1)
-	}
+		eprint("usage: slock [-v]\n");
+
+#ifndef HAVE_BSD_AUTH
 	pws = get_password();
-	if(!(dpy = XOpenDisplay(0))) {
+#endif
-		fputs("slock: cannot open display\n", stderr);
+
-		exit(EXIT_FAILURE);
+	if(!(dpy = XOpenDisplay(0)))
-	}
+		eprint("slock: cannot open display\n");
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
 
@@ -88,7 +108,7 @@ main(int argc, char **argv) {
 	XMapRaised(dpy, w);
 	for(len = 1000; len; len--) {
 		if(XGrabPointer(dpy, root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
-			GrabModeAsync, GrabModeSync, None, invisible, CurrentTime) == GrabSuccess)
+			GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
 			break;
 		usleep(1000);
 	}
@@ -105,7 +125,9 @@ main(int argc, char **argv) {
 	XSync(dpy, False);
 
 	/* main event loop */
-	while(running && !XNextEvent(dpy, &ev))
+	while(running && !XNextEvent(dpy, &ev)) {
+		if(len == 0) 
+			DPMSForceLevel(dpy, DPMSModeOff);
 		if(ev.type == KeyPress) {
 			buf[0] = 0;
 			num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
@@ -116,7 +138,14 @@ main(int argc, char **argv) {
 			switch(ksym) {
 			case XK_Return:
 				passwd[len] = 0;
-				if((running = strcmp(crypt(passwd, pws), pws)) != 0)
+
+#ifdef HAVE_BSD_AUTH
+				running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
+#else
+				running = strcmp(crypt(passwd, pws), pws);
+#endif
+
+				if (running != 0)
 					XBell(dpy, 100);
 				len = 0;
 				break;
@@ -135,6 +164,7 @@ main(int argc, char **argv) {
 				break;
 			}
 		}
+	}
 	XUngrabPointer(dpy, CurrentTime);
 	XFreePixmap(dpy, pmap);
 	XDestroyWindow(dpy, w);