applied Robert Schneider's Linux suggestions, also bumped version and updated LICENSE...

diff --git a/LICENSE b/LICENSE
index 5626eab..1c5152a 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT/X Consortium License
 
 MIT/X Consortium License
 

-© 2006-2012 Anselm R Garbe <[email protected]>
+© 2006-2013 Anselm R Garbe <[email protected]>

 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

diff --git a/config.mk b/config.mk
index 982d7a6..8cc3f68 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # slock version
 # slock version

-VERSION = 1.1
+VERSION = 1.2

 
 # Customize below to fit your system
 
 
 # Customize below to fit your system
 

diff --git a/slock.c b/slock.c
index 154a091..467937c 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -44,6 +44,21 @@ die(const char *errstr, ...) {
        exit(EXIT_FAILURE);
 }
 
        exit(EXIT_FAILURE);
 }
 

+#ifdef __linux__
+#include <fcntl.h>
+
+static void
+dontkillme(void) {
+       int fd;
+
+       fd = open("/proc/self/oom_score_adj", O_WRONLY);
+       if (fd < 0 && errno == ENOENT)
+               return;
+       if (fd < 0 || write(fd, "-1000\n", 6) != 6 || close(fd) != 0)
+               die("cannot disable the out-of-memory killer for this process\n");
+}
+#endif
+

 #ifndef HAVE_BSD_AUTH
 static const char *
 getpw(void) { /* only run as root */
 #ifndef HAVE_BSD_AUTH
 static const char *
 getpw(void) { /* only run as root */


@@ -52,7 +67,7 @@ getpw(void) { /* only run as root */
 
        pw = getpwuid(getuid());
        if(!pw)
 
        pw = getpwuid(getuid());
        if(!pw)

-               die("slock: cannot retrieve password entry (make sure to suid or sgid slock)");
+               die("slock: cannot retrieve password entry (make sure to suid or sgid slock)\n");

        endpwent();
        rval =  pw->pw_passwd;
 
        endpwent();
        rval =  pw->pw_passwd;
 


@@ -68,8 +83,9 @@ getpw(void) { /* only run as root */
 #endif
 
        /* drop privileges */
 #endif
 
        /* drop privileges */

-       if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
-               die("slock: cannot drop privileges");
+       if (geteuid() == 0
+          && ((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0))
+               die("slock: cannot drop privileges\n");

        return rval;
 }
 #endif
        return rval;
 }
 #endif


@@ -114,9 +130,9 @@ readpw(Display *dpy, const char *pws)
 #ifdef HAVE_BSD_AUTH
                                running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
 #else
 #ifdef HAVE_BSD_AUTH
                                running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
 #else

-                               running = strcmp(crypt(passwd, pws), pws);
+                               running = !!strcmp(crypt(passwd, pws), pws);

 #endif
 #endif

-                               if(running != False)
+                               if(running)

                                        XBell(dpy, 100);
                                len = 0;
                                break;
                                        XBell(dpy, 100);
                                len = 0;
                                break;


@@ -244,20 +260,24 @@ main(int argc, char **argv) {
        else if(argc != 1)
                usage();
 
        else if(argc != 1)
                usage();
 

+#ifdef __linux__
+       dontkillme();
+#endif
+

        if(!getpwuid(getuid()))
        if(!getpwuid(getuid()))

-               die("slock: no passwd entry for you");
+               die("slock: no passwd entry for you\n");

 
 #ifndef HAVE_BSD_AUTH
        pws = getpw();
 #endif
 
        if(!(dpy = XOpenDisplay(0)))
 
 #ifndef HAVE_BSD_AUTH
        pws = getpw();
 #endif
 
        if(!(dpy = XOpenDisplay(0)))

-               die("slock: cannot open display");
+               die("slock: cannot open display\n");

        /* Get the number of screens in display "dpy" and blank them all. */
        nscreens = ScreenCount(dpy);
        locks = malloc(sizeof(Lock *) * nscreens);
        if(locks == NULL)
        /* Get the number of screens in display "dpy" and blank them all. */
        nscreens = ScreenCount(dpy);
        locks = malloc(sizeof(Lock *) * nscreens);
        if(locks == NULL)

-               die("slock: malloc: %s", strerror(errno));
+               die("slock: malloc: %s\n", strerror(errno));

        int nlocks = 0;
        for(screen = 0; screen < nscreens; screen++) {
                if ( (locks[screen] = lockscreen(dpy, screen)) != NULL)
        int nlocks = 0;
        for(screen = 0; screen < nscreens; screen++) {
                if ( (locks[screen] = lockscreen(dpy, screen)) != NULL)