klesh/slock
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

applied Robert Schneider's Linux suggestions, also bumped version and updated LICENSE file's copyright notice

Browse Source
This commit is contained in:
Anselm R Garbe 2013-08-02 22:11:18 +02:00
parent 3092d3b314
commit ba3acfc0dc
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,6 +1,6 @@
MIT/X Consortium License MIT/X Consortium License
© 2006-2012 Anselm R Garbe <anselm@garbe.us> © 2006-2013 Anselm R Garbe <anselm@garbe.us>
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),

2
config.mk
View File

@ -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

36
slock.c
View File

@ -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 #ifndef HAVE_BSD_AUTH
static const char * static const char *
getpw(void) { /* only run as root */ getpw(void) { /* only run as root */
@ -52,7 +67,7 @@ getpw(void) { /* only run as root */
pw = getpwuid(getuid()); pw = getpwuid(getuid());
if(!pw) 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(); endpwent();
rval = pw->pw_passwd; rval = pw->pw_passwd;
@ -68,8 +83,9 @@ getpw(void) { /* only run as root */
#endif #endif
/* drop privileges */ /* drop privileges */
if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0) if (geteuid() == 0
die("slock: cannot drop privileges"); && ((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0))
die("slock: cannot drop privileges\n");
return rval; return rval;
} }
#endif #endif
@ -114,9 +130,9 @@ readpw(Display *dpy, const char *pws)
#ifdef HAVE_BSD_AUTH #ifdef HAVE_BSD_AUTH
running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd); running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
#else #else
running = strcmp(crypt(passwd, pws), pws); running = !!strcmp(crypt(passwd, pws), pws);
#endif #endif
if(running != False) if(running)
XBell(dpy, 100); XBell(dpy, 100);
len = 0; len = 0;
break; break;
@ -244,20 +260,24 @@ main(int argc, char **argv) {
else if(argc != 1) else if(argc != 1)
usage(); 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 #ifndef HAVE_BSD_AUTH
pws = getpw(); pws = getpw();
#endif #endif
if(!(dpy = XOpenDisplay(0))) 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. */ /* Get the number of screens in display "dpy" and blank them all. */
nscreens = ScreenCount(dpy); nscreens = ScreenCount(dpy);
locks = malloc(sizeof(Lock *) * nscreens); locks = malloc(sizeof(Lock *) * nscreens);
if(locks == NULL) if(locks == NULL)
die("slock: malloc: %s", strerror(errno)); die("slock: malloc: %s\n", strerror(errno));
int nlocks = 0; int nlocks = 0;
for(screen = 0; screen < nscreens; screen++) { for(screen = 0; screen < nscreens; screen++) {
if ( (locks[screen] = lockscreen(dpy, screen)) != NULL) if ( (locks[screen] = lockscreen(dpy, screen)) != NULL)