tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make getpwnam/getgrnam error messages more user-friendly.

This commit is contained in:
Gunnar Beutner 2013-10-10 11:28:07 +02:00
parent ac9d1d0b1a
commit 07e2a38c4d
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
icinga-app/icinga.cpp
View File

@ -243,9 +243,13 @@ int main(int argc, char **argv)
struct group *gr = getgrnam(group.CStr());
if (!gr) {
BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("getgrnam")
<< boost::errinfo_errno(errno));
if (errno == 0) {
BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid group specified: " + group));
} else {
BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("getgrnam")
<< boost::errinfo_errno(errno));
}
}
if (setgid(gr->gr_gid) < 0) {
@ -262,9 +266,13 @@ int main(int argc, char **argv)
struct passwd *pw = getpwnam(user.CStr());
if (!pw) {
BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("getpwnam")
<< boost::errinfo_errno(errno));
if (errno == 0) {
BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid user specified: " + user));
} else {
BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("getpwnam")
<< boost::errinfo_errno(errno));
}
}
if (setuid(pw->pw_uid) < 0) {