|
 |
b7dd4d |
From 69ec7c9170e29fdf745fa282448d051edd1f88b2 Mon Sep 17 00:00:00 2001
|
|
|
b7dd4d |
From: Michal Sekletar <msekleta@redhat.com>
|
|
|
b7dd4d |
Date: Tue, 9 Aug 2022 11:41:04 +0200
|
|
|
b7dd4d |
Subject: [PATCH] core/load-fragment: move config_parse_sec_fix_0 to src/shared
|
|
|
b7dd4d |
|
|
|
b7dd4d |
(cherry picked from commit 4ee8176fe33bbcd0971c4583a0e7d1cc2a64ac06)
|
|
|
b7dd4d |
|
|
|
b7dd4d |
Related: #2122288
|
|
|
b7dd4d |
---
|
|
|
b7dd4d |
src/core/load-fragment.c | 33 ---------------------------------
|
|
|
b7dd4d |
src/core/load-fragment.h | 1 -
|
|
|
b7dd4d |
src/shared/conf-parser.c | 2 ++
|
|
|
b7dd4d |
src/shared/conf-parser.h | 1 +
|
|
|
b7dd4d |
4 files changed, 3 insertions(+), 34 deletions(-)
|
|
|
b7dd4d |
|
|
|
b7dd4d |
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
|
|
|
b7dd4d |
index c0b1fd4f91..53de7ff5e9 100644
|
|
|
b7dd4d |
--- a/src/core/load-fragment.c
|
|
|
b7dd4d |
+++ b/src/core/load-fragment.c
|
|
|
b7dd4d |
@@ -1865,39 +1865,6 @@ int config_parse_service_timeout(
|
|
|
b7dd4d |
return 0;
|
|
|
b7dd4d |
}
|
|
|
b7dd4d |
|
|
|
b7dd4d |
-int config_parse_sec_fix_0(
|
|
|
b7dd4d |
- const char *unit,
|
|
|
b7dd4d |
- const char *filename,
|
|
|
b7dd4d |
- unsigned line,
|
|
|
b7dd4d |
- const char *section,
|
|
|
b7dd4d |
- unsigned section_line,
|
|
|
b7dd4d |
- const char *lvalue,
|
|
|
b7dd4d |
- int ltype,
|
|
|
b7dd4d |
- const char *rvalue,
|
|
|
b7dd4d |
- void *data,
|
|
|
b7dd4d |
- void *userdata) {
|
|
|
b7dd4d |
-
|
|
|
b7dd4d |
- usec_t *usec = data;
|
|
|
b7dd4d |
- int r;
|
|
|
b7dd4d |
-
|
|
|
b7dd4d |
- assert(filename);
|
|
|
b7dd4d |
- assert(lvalue);
|
|
|
b7dd4d |
- assert(rvalue);
|
|
|
b7dd4d |
- assert(usec);
|
|
|
b7dd4d |
-
|
|
|
b7dd4d |
- /* This is pretty much like config_parse_sec(), except that this treats a time of 0 as infinity, for
|
|
|
b7dd4d |
- * compatibility with older versions of systemd where 0 instead of infinity was used as indicator to turn off a
|
|
|
b7dd4d |
- * timeout. */
|
|
|
b7dd4d |
-
|
|
|
b7dd4d |
- r = parse_sec_fix_0(rvalue, usec);
|
|
|
b7dd4d |
- if (r < 0) {
|
|
|
b7dd4d |
- log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse %s= parameter, ignoring: %s", lvalue, rvalue);
|
|
|
b7dd4d |
- return 0;
|
|
|
b7dd4d |
- }
|
|
|
b7dd4d |
-
|
|
|
b7dd4d |
- return 0;
|
|
|
b7dd4d |
-}
|
|
|
b7dd4d |
-
|
|
|
b7dd4d |
int config_parse_user_group_compat(
|
|
|
b7dd4d |
const char *unit,
|
|
|
b7dd4d |
const char *filename,
|
|
|
b7dd4d |
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
|
|
|
b7dd4d |
index f9d34d484d..b964737f9e 100644
|
|
|
b7dd4d |
--- a/src/core/load-fragment.h
|
|
|
b7dd4d |
+++ b/src/core/load-fragment.h
|
|
|
b7dd4d |
@@ -95,7 +95,6 @@ CONFIG_PARSER_PROTOTYPE(config_parse_bus_name);
|
|
|
b7dd4d |
CONFIG_PARSER_PROTOTYPE(config_parse_exec_utmp_mode);
|
|
|
b7dd4d |
CONFIG_PARSER_PROTOTYPE(config_parse_working_directory);
|
|
|
b7dd4d |
CONFIG_PARSER_PROTOTYPE(config_parse_fdname);
|
|
|
b7dd4d |
-CONFIG_PARSER_PROTOTYPE(config_parse_sec_fix_0);
|
|
|
b7dd4d |
CONFIG_PARSER_PROTOTYPE(config_parse_user_group_compat);
|
|
|
b7dd4d |
CONFIG_PARSER_PROTOTYPE(config_parse_user_group_strv_compat);
|
|
|
b7dd4d |
CONFIG_PARSER_PROTOTYPE(config_parse_restrict_namespaces);
|
|
|
b7dd4d |
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
|
|
|
b7dd4d |
index 1f40f00c72..414dde2e3d 100644
|
|
|
b7dd4d |
--- a/src/shared/conf-parser.c
|
|
|
b7dd4d |
+++ b/src/shared/conf-parser.c
|
|
|
b7dd4d |
@@ -1286,3 +1286,5 @@ int config_parse_permille(const char* unit,
|
|
|
b7dd4d |
|
|
|
b7dd4d |
return 0;
|
|
|
b7dd4d |
}
|
|
|
b7dd4d |
+
|
|
|
b7dd4d |
+DEFINE_CONFIG_PARSE_PTR(config_parse_sec_fix_0, parse_sec_fix_0, usec_t, "Failed to parse time value");
|
|
|
b7dd4d |
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
|
|
|
b7dd4d |
index 375b2e5a74..56fd302db8 100644
|
|
|
b7dd4d |
--- a/src/shared/conf-parser.h
|
|
|
b7dd4d |
+++ b/src/shared/conf-parser.h
|
|
|
b7dd4d |
@@ -142,6 +142,7 @@ CONFIG_PARSER_PROTOTYPE(config_parse_ip_port);
|
|
|
b7dd4d |
CONFIG_PARSER_PROTOTYPE(config_parse_join_controllers);
|
|
|
b7dd4d |
CONFIG_PARSER_PROTOTYPE(config_parse_mtu);
|
|
|
b7dd4d |
CONFIG_PARSER_PROTOTYPE(config_parse_rlimit);
|
|
|
b7dd4d |
+CONFIG_PARSER_PROTOTYPE(config_parse_sec_fix_0);
|
|
|
b7dd4d |
|
|
|
b7dd4d |
typedef enum Disabled {
|
|
|
b7dd4d |
DISABLED_CONFIGURATION,
|