mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-14 04:33:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

conf-parser: drop special casing in config_parse_path()

Browse Source 
The code checked for two lvalues that aren't even using
config_parse_path(), so let's drop these checks and make the function
completely generic again.
This commit is contained in:
Lennart Poettering 2014-03-03 21:42:38 +01:00
parent 94828d2ddc
commit 3b43629240
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/shared/conf-parser.c
View File

@ -617,9 +617,7 @@ int config_parse_path(const char *unit,
void *data,
void *userdata) {
char **s = data;
char *n;
int offset;
char **s = data, *n;
assert(filename);
assert(lvalue);
@ -627,16 +625,12 @@ int config_parse_path(const char *unit,
assert(data);
if (!utf8_is_valid(rvalue)) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Path is not UTF-8 clean, ignoring assignment: %s", rvalue);
log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Path is not UTF-8 clean, ignoring assignment: %s", rvalue);
return 0;
}
offset = rvalue[0] == '-' && (streq(lvalue, "InaccessibleDirectories") ||
streq(lvalue, "ReadOnlyDirectories"));
if (!path_is_absolute(rvalue + offset)) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Not an absolute path, ignoring: %s", rvalue);
if (!path_is_absolute(rvalue)) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Not an absolute path, ignoring: %s", rvalue);
return 0;
}