summaryrefslogtreecommitdiff
path: root/src/load-fragment.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-31 21:22:44 +0200
committerLennart Poettering <lennart@poettering.net>2011-03-31 21:22:44 +0200
commit7d76f312889d54dcfe6fdde6eb055e890e7a615b (patch)
tree7ef1439ab07d28ca0a530d5643eec5bf0de33a40 /src/load-fragment.c
parent29db583471f019ed9939a90966b3e194a9560e7e (diff)
log: fix shifting of facilities
Diffstat (limited to 'src/load-fragment.c')
-rw-r--r--src/load-fragment.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/load-fragment.c b/src/load-fragment.c
index 343525665a..05d858e86a 100644
--- a/src/load-fragment.c
+++ b/src/load-fragment.c
@@ -584,12 +584,12 @@ static int config_parse_facility(
assert(rvalue);
assert(data);
- if ((x = log_facility_from_string(rvalue)) < 0) {
+ if ((x = log_facility_unshifted_from_string(rvalue)) < 0) {
log_error("[%s:%u] Failed to parse log facility, ignoring: %s", filename, line, rvalue);
return 0;
}
- *o = LOG_MAKEPRI(x, LOG_PRI(*o));
+ *o = (x << 3) | LOG_PRI(*o);
return 0;
}
@@ -617,7 +617,7 @@ static int config_parse_level(
return 0;
}
- *o = LOG_MAKEPRI(LOG_FAC(*o), x);
+ *o = (*o & LOG_FACMASK) | x;
return 0;
}