Xinqi Bao's Git
projects
/
slock.git
/ diff
summary
|
log
|
commit
|
diff
|
tree
raw
|
patch
|
inline
| side by side (parent:
a55594f
)
make error message prefix consistent
author
Markus Teich <
[email protected]
>
Wed, 7 Sep 2016 08:04:06 +0000
(10:04 +0200)
committer
Markus Teich <
[email protected]
>
Wed, 7 Sep 2016 08:04:06 +0000
(10:04 +0200)
slock.c
diff
|
blob
|
history
diff --git
a/slock.c
b/slock.c
index
08ada6f
..
62a9841
100644
(file)
--- a/
slock.c
+++ b/
slock.c
@@
-99,9
+99,9
@@
getpw(void)
errno = 0;
if (!(pw = getpwuid(getuid()))) {
if (errno)
errno = 0;
if (!(pw = getpwuid(getuid()))) {
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') {
struct spwd *sp;
if (!(sp = getspnam(getenv("USER"))))
if (rval[0] == 'x' && rval[1] == '\0') {
struct spwd *sp;
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;
}
#endif
rval = sp->sp_pwdp;
}
#endif
@@
-117,7
+117,7
@@
getpw(void)
/* drop privileges */
if (geteuid() == 0 &&
((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0))
/* drop privileges */
if (geteuid() == 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;
}
#endif
return rval;
}
#endif