commit fb333c31ecf8a9ae004a8005742e33291e5d7c23
Author: Jan Christoph Ebersbach <[email protected]>
Date: Sat Nov 26 11:38:48 2016 +0100
Update slock-pam_auth patch
diff --git a/tools.suckless.org/slock/patches/pam_auth.md
b/tools.suckless.org/slock/patches/pam_auth.md
index db5b897..4a4f252 100644
--- a/tools.suckless.org/slock/patches/pam_auth.md
+++ b/tools.suckless.org/slock/patches/pam_auth.md
@@ -12,6 +12,7 @@ service. The default configuration is for ArchLinux's
`login` service.
Download
--------
+* [slock-pam_auth-20161126-9909280.diff](slock-pam_auth-20161126-9909280.diff)
* [slock-pam_auth-20161026-5974695.diff](slock-pam_auth-20161026-5974695.diff)
* [slock-pam_auth-20160909-a7619f7.diff](slock-pam_auth-20160909-a7619f7.diff)
* [slock-pam_auth.diff](slock-pam_auth.diff)
diff --git
a/tools.suckless.org/slock/patches/slock-pam_auth-20161126-9909280.diff
b/tools.suckless.org/slock/patches/slock-pam_auth-20161126-9909280.diff
new file mode 100644
index 0000000..d8b6c84
--- /dev/null
+++ b/tools.suckless.org/slock/patches/slock-pam_auth-20161126-9909280.diff
@@ -0,0 +1,161 @@
+Author: Jan Christoph Ebersbach <[email protected]>
+URL: http://tools.suckless.org/slock/patches/pam_auth
+Replaces shadow support with PAM authentication support.
+
+Change variable `pam_service` in `config.def.h` to the corresponding PAM
+service. The default configuration is for ArchLinux's `login` service.
+
+Index: slock-patches/slock/config.def.h
+===================================================================
+--- slock-patches.orig/slock/config.def.h
++++ slock-patches/slock/config.def.h
+@@ -6,7 +6,11 @@ static const char *colorname[NUMCOLS] =
+ [INIT] = "black", /* after initialization */
+ [INPUT] = "#005577", /* during input */
+ [FAILED] = "#CC3333", /* wrong password */
++ [PAM] = "#9400D3", /* waiting for PAM */
+ };
+
+ /* treat a cleared input like a wrong password (color) */
+ static const int failonclear = 1;
++
++/* PAM service that's used for authentication */
++static const char* pam_service = "login";
+Index: slock-patches/slock/config.mk
+===================================================================
+--- slock-patches.orig/slock/config.mk
++++ slock-patches/slock/config.mk
+@@ -12,7 +12,7 @@ X11LIB = /usr/X11R6/lib
+
+ # includes and libs
+ INCS = -I. -I/usr/include -I${X11INC}
+-LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr
++LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -lpam
+
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H
+Index: slock-patches/slock/slock.c
+===================================================================
+--- slock-patches.orig/slock/slock.c
++++ slock-patches/slock/slock.c
+@@ -18,16 +18,22 @@
+ #include <X11/keysym.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
++#include <security/pam_appl.h>
++#include <security/pam_misc.h>
+
+ #include "arg.h"
+ #include "util.h"
+
+ char *argv0;
++static int pam_conv(int num_msg, const struct pam_message **msg, struct
pam_response **resp, void *appdata_ptr);
++struct pam_conv pamc = {pam_conv, NULL};
++char passwd[256];
+
+ enum {
+ INIT,
+ INPUT,
+ FAILED,
++ PAM,
+ NUMCOLS
+ };
+
+@@ -57,6 +63,31 @@ die(const char *errstr, ...)
+ exit(1);
+ }
+
++static int
++pam_conv(int num_msg, const struct pam_message **msg,
++ struct pam_response **resp, void *appdata_ptr)
++{
++ int retval = PAM_CONV_ERR;
++ for(int i=0; i<num_msg; i++) {
++ if (msg[i]->msg_style == PAM_PROMPT_ECHO_OFF &&
++ strncmp(msg[i]->msg, "Password: ", 10) == 0) {
++ struct pam_response *resp_msg = malloc(sizeof(struct
pam_response));
++ if (!resp_msg)
++ die("malloc failed
");
++ char *password = malloc(strlen(passwd) + 1);
++ if (!password)
++ die("malloc failed
");
++ memset(password, 0, strlen(passwd) + 1);
++ strcpy(password, passwd);
++ resp_msg->resp_retcode = 0;
++ resp_msg->resp = password;
++ resp[i] = resp_msg;
++ retval = PAM_SUCCESS;
++ }
++ }
++ return retval;
++}
++
+ #ifdef __linux__
+ #include <fcntl.h>
+ #include <linux/oom.h>
+@@ -121,6 +152,8 @@ gethash(void)
+ }
+ #endif /* HAVE_SHADOW_H */
+
++ /* pam, store user name */
++ hash = pw->pw_name;
+ return hash;
+ }
+
+@@ -129,11 +162,12 @@ readpw(Display *dpy, struct xrandr *rr,
+ const char *hash)
+ {
+ XRRScreenChangeNotifyEvent *rre;
+- char buf[32], passwd[256], *inputhash;
+- int num, screen, running, failure, oldc;
++ char buf[32];
++ int num, screen, running, failure, oldc, retval;
+ unsigned int len, color;
+ KeySym ksym;
+ XEvent ev;
++ pam_handle_t *pamh;
+
+ len = 0;
+ running = 1;
+@@ -160,10 +194,26 @@ readpw(Display *dpy, struct xrandr *rr,
+ case XK_Return:
+ passwd[len] = '
