public
/
slock-bgimage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

applied BSD support patch

This commit is contained in:
Anselm R. Garbe 2006-10-12 08:11:08 +02:00
parent 2fa12210c9
commit 0f1157d7e6
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.mk
View File

@ -15,11 +15,14 @@ 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
# flags # flags
CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
LDFLAGS = ${LIBS} LDFLAGS = ${LIBS}
#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
#LDFLAGS = -g ${LIBS} #LDFLAGS = -g ${LIBS}
# On *BSD remove -DHAVE_SHADOW_H from CFLAGS
# On OpenBSD remove -lcrypt from LIBS
# compiler and linker # compiler and linker
CC = cc CC = cc
LD = ${CC} LD = ${CC}

22
slock.c
View File

@ -2,7 +2,13 @@
* See LICENSE file for license details. * See LICENSE file for license details.
*/ */
#define _XOPEN_SOURCE #define _XOPEN_SOURCE
#if HAVE_SHADOW_H
#include <shadow.h> #include <shadow.h>
#else
#include <pwd.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -17,7 +23,11 @@ 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, prev_nitem, screen; int num, prev_nitem, screen;
#if HAVE_SHADOW_H
struct spwd *sp; struct spwd *sp;
#else
struct passwd *pw;
#endif
unsigned int i, len; unsigned int i, len;
Bool running = True; Bool running = True;
Cursor invisible; Cursor invisible;
@ -33,11 +43,17 @@ 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(!(sp = getspnam(getenv("USER")))) { if(geteuid() != 0) {
fputs("slock: cannot retrieve password entry (make sure to suid slock)\n", stderr); fputs("slock: cannot retrieve password entry (make sure to suid slock)\n", stderr);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#if HAVE_SHADOW_H
sp = getspnam(getenv("USER"));
endspent(); 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);
@ -87,7 +103,11 @@ main(int argc, char **argv) {
} }
switch(ksym) { switch(ksym) {
case XK_Return: case XK_Return:
#if HAVE_SHADOW_H
if((running = strncmp(crypt(passwd, sp->sp_pwdp), sp->sp_pwdp, sizeof(passwd)))) if((running = strncmp(crypt(passwd, sp->sp_pwdp), sp->sp_pwdp, sizeof(passwd))))
#else
if((running = strncmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd, sizeof(passwd))))
#endif
XBell(dpy, 100); XBell(dpy, 100);
passwd[0] = 0; passwd[0] = 0;
break; break;