diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2021-01-11 17:41:24 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2021-01-11 17:41:24 +0100 |
| commit | a82e048a943092315a32d745c99e0f5635e29134 (patch) | |
| tree | e2daea99a161768c9b956bfea9117289deaf31be /shared/systemd/src/basic/parse-util.c | |
| parent | b51f06ff71a2060925bf3c0f04c44bd12480e670 (diff) | |
| parent | 65f86e8f56267192d42f2b629fc6b0c99fb9cd0c (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'shared/systemd/src/basic/parse-util.c')
| -rw-r--r-- | shared/systemd/src/basic/parse-util.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/shared/systemd/src/basic/parse-util.c b/shared/systemd/src/basic/parse-util.c index 0b343b2a..6b47317a 100644 --- a/shared/systemd/src/basic/parse-util.c +++ b/shared/systemd/src/basic/parse-util.c @@ -18,6 +18,9 @@ #include "missing_network.h" #include "parse-util.h" #include "process-util.h" +#if HAVE_SECCOMP +#include "seccomp-util.h" +#endif #include "stat-util.h" #include "string-util.h" #include "strv.h" @@ -317,6 +320,7 @@ int parse_errno(const char *t) { return e; } +#if HAVE_SECCOMP int parse_syscall_and_errno(const char *in, char **name, int *error) { _cleanup_free_ char *n = NULL; char *p; @@ -335,7 +339,7 @@ int parse_syscall_and_errno(const char *in, char **name, int *error) { p = strchr(in, ':'); if (p) { - e = parse_errno(p + 1); + e = seccomp_parse_errno_or_action(p + 1); if (e < 0) return e; @@ -354,6 +358,7 @@ int parse_syscall_and_errno(const char *in, char **name, int *error) { return 0; } +#endif #endif /* NM_IGNORED */ static const char *mangle_base(const char *s, unsigned *base) { |