chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: also relabel pre-mounted API dirs
[elogind.git]
/
src
/
load-fragment.c
diff --git
a/src/load-fragment.c
b/src/load-fragment.c
index 343525665a60a955cbfc17b5cc303e72ffa9d0f9..05d858e86a74e9a57f51b58f5b80f02437e3f754 100644
(file)
--- a/
src/load-fragment.c
+++ b/
src/load-fragment.c
@@
-584,12
+584,12
@@
static int config_parse_facility(
assert(rvalue);
assert(data);
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;
}
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;
}
return 0;
}
@@
-617,7
+617,7
@@
static int config_parse_level(
return 0;
}
return 0;
}
- *o =
LOG_MAKEPRI(LOG_FAC(*o), x)
;
+ *o =
(*o & LOG_FACMASK) | x
;
return 0;
}
return 0;
}