Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

launch: align errors when reading service-files with dbus-daemon(1) #184

Merged
merged 1 commit into from
Jan 11, 2019
Merged

launch: align errors when reading service-files with dbus-daemon(1) #184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/launch/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,12 +880,24 @@ static int manager_ini_reader_parse_file(CIniGroup **groupp, const char *path) {

fd = open(path, O_RDONLY | O_CLOEXEC);
if (fd < 0) {
if (errno == ENOENT) {
*groupp = NULL;
return 0;
}
/*
* For compatibility reasons we have to accept any failure
* during open(2). dbus-daemon(1) simply ignores those errors
* and skips the service file in question.
*
* We would very much prefer to whitelist specific error codes
* here, but we would be playing whack-a-mole, so lets just
* treat it as soft-error.
*/
if (errno == ENOENT)
fprintf(stderr, "Original source was unlinked while parsing service file '%s'\n", path);
else if (errno == EACCES)
fprintf(stderr, "Read access denied for service file '%s'\n", path);
else
fprintf(stderr, "Unable to open service file '%s' (%d): %m\n", path, errno);

return error_origin(-errno);
*groupp = NULL;
return 0;
}

r = c_ini_reader_new(&reader);
Expand Down