tyler/suckless-slock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make error message prefix consistent

Browse Source
This commit is contained in:
Markus Teich 2016-09-07 10:04:06 +02:00
parent a55594fdd6
commit 9698224090
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slock.c
View File

@ -99,9 +99,9 @@ getpw(void)
errno = 0; errno = 0;
if (!(pw = getpwuid(getuid()))) { if (!(pw = getpwuid(getuid()))) {
if (errno) if (errno)
die("getpwuid: %s\n", strerror(errno)); die("slock: getpwuid: %s\n", strerror(errno));
else else
die("cannot retrieve password entry\n"); die("slock: cannot retrieve password entry\n");
} }
rval = pw->pw_passwd; rval = pw->pw_passwd;
@ -109,7 +109,7 @@ getpw(void)
if (rval[0] == 'x' && rval[1] == '\0') { if (rval[0] == 'x' && rval[1] == '\0') {
struct spwd *sp; struct spwd *sp;
if (!(sp = getspnam(getenv("USER")))) if (!(sp = getspnam(getenv("USER"))))
die("cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
rval = sp->sp_pwdp; rval = sp->sp_pwdp;
} }
#endif #endif
@ -117,7 +117,7 @@ getpw(void)
/* drop privileges */ /* drop privileges */
if (geteuid() == 0 && if (geteuid() == 0 &&
((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0)) ((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0))
die("cannot drop privileges\n"); die("slock: cannot drop privileges\n");
return rval; return rval;
} }
#endif #endif