From 7d76f312889d54dcfe6fdde6eb055e890e7a615b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 31 Mar 2011 21:22:44 +0200 Subject: log: fix shifting of facilities --- src/load-fragment.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/load-fragment.c') 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; } -- cgit v1.2.3-54-g00ecf