j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

change error messages in droppriv code to match the rest

Browse source 
Change formatting of error messages about failed syscalls
to be the same as in other places in tincd.

Also suggest a change in "$foo not supported on this platform"
message as it's now used more than once.
This commit is contained in:
Michael Tokarev 2009-05-18 17:00:00 +04:00 committed by Guus Sliepen
parent d4f9863635
commit 54cb6b1aec
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/tincd.c
View file

@ -161,6 +161,7 @@ static bool parse_options(int argc, char **argv)
case 'L': /* no detach */ case 'L': /* no detach */
#ifndef HAVE_MLOCKALL #ifndef HAVE_MLOCKALL
/* logger(LOG_ERR, _("%s not supported on this platform"), "mlockall()"); */
logger(LOG_ERR, _("mlockall() not supported on this platform!")); logger(LOG_ERR, _("mlockall() not supported on this platform!"));
return false; return false;
#else #else
@ -457,7 +458,8 @@ static bool drop_privs() {
uid = pw->pw_uid; uid = pw->pw_uid;
if (initgroups(switchuser, pw->pw_gid) != 0 || if (initgroups(switchuser, pw->pw_gid) != 0 ||
setgid(pw->pw_gid) != 0) { setgid(pw->pw_gid) != 0) {
logger(LOG_ERR, _("%s failed"), "initgroups()"); logger(LOG_ERR, _("System call `%s' failed: %s"),
"initgroups", strerror(errno));
return false; return false;
} }
endgrent(); endgrent();
@ -466,7 +468,8 @@ static bool drop_privs() {
if (do_chroot) { if (do_chroot) {
tzset(); /* for proper timestamps in logs */ tzset(); /* for proper timestamps in logs */
if (chroot(confbase) != 0 || chdir("/") != 0) { if (chroot(confbase) != 0 || chdir("/") != 0) {
logger(LOG_ERR, _("%s failed"), "chroot()"); logger(LOG_ERR, _("System call `%s' failed: %s"),
"chroot", strerror(errno));
return false; return false;
} }
free(confbase); free(confbase);
@ -474,7 +477,8 @@ static bool drop_privs() {
} }
if (switchuser) if (switchuser)
if (setuid(uid) != 0) { if (setuid(uid) != 0) {
logger(LOG_ERR, _("%s failed"), "setuid()"); logger(LOG_ERR, _("System call `%s' failed: %s"),
"setuid", strerror(errno));
return false; return false;
} }
#endif #endif