systemd: merge branch systemd into master

2019-09-25 09:10:44 +02:00
parent 43b7e66948 503b5f441e
commit 85bdf42112
21 changed files with 265 additions and 63 deletions
--- a/shared/systemd/src/basic/extract-word.c
+++ b/shared/systemd/src/basic/extract-word.c
@@ -30,8 +30,6 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra

        assert(p);
        assert(ret);
-        /* Those two don't make sense together. */
-        assert(!FLAGS_SET(flags, EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE));

        /* Bail early if called after last value or with no input */
        if (!*p)