|
 |
594167 |
From 009b55d532a66704072ca0c01e8dc218d318b520 Mon Sep 17 00:00:00 2001
|
|
|
594167 |
From: Michal Sekletar <msekleta@redhat.com>
|
|
|
594167 |
Date: Tue, 9 Aug 2022 11:41:04 +0200
|
|
|
594167 |
Subject: [PATCH] core/load-fragment: move config_parse_sec_fix_0 to src/shared
|
|
|
594167 |
|
|
|
594167 |
(cherry picked from commit 4ee8176fe33bbcd0971c4583a0e7d1cc2a64ac06)
|
|
|
594167 |
|
|
|
594167 |
Related: #2100464
|
|
|
594167 |
---
|
|
|
594167 |
src/core/load-fragment.c | 31 -------------------------------
|
|
|
594167 |
src/core/load-fragment.h | 1 -
|
|
|
594167 |
src/shared/conf-parser.c | 1 +
|
|
|
594167 |
src/shared/conf-parser.h | 1 +
|
|
|
594167 |
4 files changed, 2 insertions(+), 32 deletions(-)
|
|
|
594167 |
|
|
|
594167 |
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
|
|
|
594167 |
index 0acc350389..e26581c1d5 100644
|
|
|
594167 |
--- a/src/core/load-fragment.c
|
|
|
594167 |
+++ b/src/core/load-fragment.c
|
|
|
594167 |
@@ -2518,37 +2518,6 @@ int config_parse_service_timeout_abort(
|
|
|
594167 |
return 0;
|
|
|
594167 |
}
|
|
|
594167 |
|
|
|
594167 |
-int config_parse_sec_fix_0(
|
|
|
594167 |
- const char *unit,
|
|
|
594167 |
- const char *filename,
|
|
|
594167 |
- unsigned line,
|
|
|
594167 |
- const char *section,
|
|
|
594167 |
- unsigned section_line,
|
|
|
594167 |
- const char *lvalue,
|
|
|
594167 |
- int ltype,
|
|
|
594167 |
- const char *rvalue,
|
|
|
594167 |
- void *data,
|
|
|
594167 |
- void *userdata) {
|
|
|
594167 |
-
|
|
|
594167 |
- usec_t *usec = data;
|
|
|
594167 |
- int r;
|
|
|
594167 |
-
|
|
|
594167 |
- assert(filename);
|
|
|
594167 |
- assert(lvalue);
|
|
|
594167 |
- assert(rvalue);
|
|
|
594167 |
- assert(usec);
|
|
|
594167 |
-
|
|
|
594167 |
- /* This is pretty much like config_parse_sec(), except that this treats a time of 0 as infinity, for
|
|
|
594167 |
- * compatibility with older versions of systemd where 0 instead of infinity was used as indicator to turn off a
|
|
|
594167 |
- * timeout. */
|
|
|
594167 |
-
|
|
|
594167 |
- r = parse_sec_fix_0(rvalue, usec);
|
|
|
594167 |
- if (r < 0)
|
|
|
594167 |
- log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to parse %s= parameter, ignoring: %s", lvalue, rvalue);
|
|
|
594167 |
-
|
|
|
594167 |
- return 0;
|
|
|
594167 |
-}
|
|
|
594167 |
-
|
|
|
594167 |
int config_parse_user_group_compat(
|
|
|
594167 |
const char *unit,
|
|
|
594167 |
const char *filename,
|
|
|
594167 |
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
|
|
|
594167 |
index 26b8de28f7..4c302c43ec 100644
|
|
|
594167 |
--- a/src/core/load-fragment.h
|
|
|
594167 |
+++ b/src/core/load-fragment.h
|
|
|
594167 |
@@ -114,7 +114,6 @@ CONFIG_PARSER_PROTOTYPE(config_parse_bus_name);
|
|
|
594167 |
CONFIG_PARSER_PROTOTYPE(config_parse_exec_utmp_mode);
|
|
|
594167 |
CONFIG_PARSER_PROTOTYPE(config_parse_working_directory);
|
|
|
594167 |
CONFIG_PARSER_PROTOTYPE(config_parse_fdname);
|
|
|
594167 |
-CONFIG_PARSER_PROTOTYPE(config_parse_sec_fix_0);
|
|
|
594167 |
CONFIG_PARSER_PROTOTYPE(config_parse_user_group_compat);
|
|
|
594167 |
CONFIG_PARSER_PROTOTYPE(config_parse_user_group_strv_compat);
|
|
|
594167 |
CONFIG_PARSER_PROTOTYPE(config_parse_restrict_namespaces);
|
|
|
594167 |
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
|
|
|
594167 |
index d19041207c..7bfed38834 100644
|
|
|
594167 |
--- a/src/shared/conf-parser.c
|
|
|
594167 |
+++ b/src/shared/conf-parser.c
|
|
|
594167 |
@@ -1592,3 +1592,4 @@ int config_parse_in_addr_non_null(
|
|
|
594167 |
|
|
|
594167 |
DEFINE_CONFIG_PARSE(config_parse_percent, parse_percent, "Failed to parse percent value");
|
|
|
594167 |
DEFINE_CONFIG_PARSE(config_parse_permyriad, parse_permyriad, "Failed to parse permyriad value");
|
|
|
594167 |
+DEFINE_CONFIG_PARSE_PTR(config_parse_sec_fix_0, parse_sec_fix_0, usec_t, "Failed to parse time value");
|
|
|
594167 |
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
|
|
|
594167 |
index d686665532..fbfdbdb333 100644
|
|
|
594167 |
--- a/src/shared/conf-parser.h
|
|
|
594167 |
+++ b/src/shared/conf-parser.h
|
|
|
594167 |
@@ -157,6 +157,7 @@ CONFIG_PARSER_PROTOTYPE(config_parse_ether_addrs);
|
|
|
594167 |
CONFIG_PARSER_PROTOTYPE(config_parse_in_addr_non_null);
|
|
|
594167 |
CONFIG_PARSER_PROTOTYPE(config_parse_percent);
|
|
|
594167 |
CONFIG_PARSER_PROTOTYPE(config_parse_permyriad);
|
|
|
594167 |
+CONFIG_PARSER_PROTOTYPE(config_parse_sec_fix_0);
|
|
|
594167 |
|
|
|
594167 |
typedef enum Disabled {
|
|
|
594167 |
DISABLED_CONFIGURATION,
|