suckless/slock
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

applied Vincent's path with some modifications

Browse source
This commit is contained in:
arg@mig29 2006-10-31 08:35:54 +01:00
parent 8a7a68c4c0
commit 27d8d24827
1 changed files with 43 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
slock.c
View file

@ -3,32 +3,55 @@
*/ */
#define _XOPEN_SOURCE 500 #define _XOPEN_SOURCE 500
#if HAVE_SHADOW_H
#include <shadow.h>
#else
#include <pwd.h>
#endif
#include <ctype.h> #include <ctype.h>
#include <pwd.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#if HAVE_SHADOW_H
#include <shadow.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
const char *
get_password() { /* only run as root */
const char *rval;
struct passwd *pw;
if(geteuid() != 0) {
fputs("slock: cannot retrieve password entry (make sure to suid slock)\n", stderr);
exit(EXIT_FAILURE);
}
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) {
fputs("slock: cannot drop privileges\n",stdout);
exit(EXIT_FAILURE);
}
return rval;
}
int int
main(int argc, char **argv) { main(int argc, char **argv) {
char curs[] = {0, 0, 0, 0, 0, 0, 0, 0}; char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
char buf[32], passwd[256]; char buf[32], passwd[256];
int num, screen; int num, screen;
#if HAVE_SHADOW_H const char *pws;
struct spwd *sp;
#else
struct passwd *pw;
#endif
unsigned int len; unsigned int len;
Bool running = True; Bool running = True;
Cursor invisible; Cursor invisible;
@ -44,17 +67,7 @@ main(int argc, char **argv) {
fputs("slock-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); fputs("slock-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
if(geteuid() != 0) { pws = get_password();
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();
#endif
if(!(dpy = XOpenDisplay(0))) { if(!(dpy = XOpenDisplay(0))) {
fputs("slock: cannot open display\n", stderr); fputs("slock: cannot open display\n", stderr);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -62,7 +75,7 @@ main(int argc, char **argv) {
screen = DefaultScreen(dpy); screen = DefaultScreen(dpy);
/* init */ /* init */
passwd[0] = 0; len = 0;
wa.override_redirect = 1; wa.override_redirect = 1;
wa.background_pixel = BlackPixel(dpy, screen); wa.background_pixel = BlackPixel(dpy, screen);
@ -89,7 +102,6 @@ main(int argc, char **argv) {
/* main event loop */ /* main event loop */
while(running && !XNextEvent(dpy, &ev)) while(running && !XNextEvent(dpy, &ev))
if(ev.type == KeyPress) { if(ev.type == KeyPress) {
len = strlen(passwd);
buf[0] = 0; buf[0] = 0;
num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0); num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);
if(IsFunctionKey(ksym) || IsKeypadKey(ksym) if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
@ -98,28 +110,22 @@ main(int argc, char **argv) {
continue; continue;
switch(ksym) { switch(ksym) {
case XK_Return: case XK_Return:
#if HAVE_SHADOW_H passwd[len] = 0;
if((running = strncmp(crypt(passwd, sp->sp_pwdp), sp->sp_pwdp, sizeof(passwd)))) if((running = strcmp(crypt(passwd, pws), pws)) != 0)
#else
if((running = strncmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd, sizeof(passwd))))
#endif
XBell(dpy, 100); XBell(dpy, 100);
passwd[0] = 0; len = 0;
break; break;
case XK_Escape: case XK_Escape:
passwd[0] = 0; len = 0;
break; break;
case XK_BackSpace: case XK_BackSpace:
if(len) if(len)
passwd[--len] = 0; --len;
break; break;
default: default:
if(num && !iscntrl((int) buf[0])) { if(num && !iscntrl((int) buf[0])) {
buf[num] = 0; memcpy(passwd + len,buf,num);
if(len) len += num;
strncat(passwd, buf, sizeof(passwd));
else
strncpy(passwd, buf, sizeof(passwd));
} }
break; break;
} }