-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathrevision-2998.patch
45 lines (44 loc) · 1.22 KB
/
revision-2998.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
Index: exec/mainconfig.c
===================================================================
--- exec/mainconfig.c (revision 2997)
+++ exec/mainconfig.c (revision 2998)
@@ -528,22 +528,26 @@
object_logger_subsys_handle,
"name", &value)) {
- if ((strcmp(value, "corosync") == 0) &&
- (!objdb_get_string (objdb,
- object_logger_subsys_handle,
- "subsys", &value))) {
-
- if (corosync_main_config_set (objdb,
- object_logger_subsys_handle,
- value,
- &error_reason) < 0) {
- goto parse_error;
+ if (strcmp(value, "corosync") == 0) {
+ if (!objdb_get_string (objdb,
+ object_logger_subsys_handle,
+ "subsys", &value)) {
+ if (corosync_main_config_set (objdb,
+ object_logger_subsys_handle,
+ value,
+ &error_reason) < 0) {
+ goto parse_error;
+ }
}
+ else {
+ if (corosync_main_config_set (objdb,
+ object_logger_subsys_handle,
+ NULL,
+ &error_reason) < 0) {
+ goto parse_error;
+ }
+ }
}
- else {
- error_reason = "subsys required for logging_daemon directive";
- goto parse_error;
- }
}
else {
error_reason = "name required for logging_daemon directive";