diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-04-30 20:21:00 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-05-05 15:06:42 -0700 |
| commit | 7410616cd9dbbec97cf98d75324da5cda2b2f7a2 (patch) | |
| tree | 6d968995b3bdf961603ab4853bf078c0dbdce27c /src/debug-generator | |
| parent | 6442185ab674cc202d63c18605057b9a51ca2722 (diff) | |
core: rework unit name validation and manipulation logic
A variety of changes:
- Make sure all our calls distuingish OOM from other errors if OOM is
not the only error possible.
- Be much stricter when parsing escaped paths, do not accept trailing or
leading escaped slashes.
- Change unit validation to take a bit mask for allowing plain names,
instance names or template names or an combination thereof.
- Refuse manipulating invalid unit name
Diffstat (limited to 'src/debug-generator')
| -rw-r--r-- | src/debug-generator/debug-generator.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c index 1b9019325c..9d0ab06e2f 100644 --- a/src/debug-generator/debug-generator.c +++ b/src/debug-generator/debug-generator.c @@ -41,9 +41,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { else { char *n; - n = unit_name_mangle(value, MANGLE_NOGLOB); - if (!n) - return log_oom(); + r = unit_name_mangle(value, UNIT_NAME_NOGLOB, &n); + if (r < 0) + return log_error_errno(r, "Failed to glob unit name: %m"); r = strv_consume(&arg_mask, n); if (r < 0) @@ -57,9 +57,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { else { char *n; - n = unit_name_mangle(value, MANGLE_NOGLOB); - if (!n) - return log_oom(); + r = unit_name_mangle(value, UNIT_NAME_NOGLOB, &n); + if (r < 0) + return log_error_errno(r, "Failed to glob unit name: %m"); r = strv_consume(&arg_wants, n); if (r < 0) |