summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-28 12:25:09 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-28 12:28:44 -0500
commite80733be33e52d8ab2f1ae845326d39c600f5612 (patch)
treeb4b64cbdf361cca8329d7374b9ea81a2b5d17c03
parent23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41 (diff)
Revert "systemctl: append default suffix only if none present"
This reverts a chunk out of commit 5e03c6e3b517286bbd65b48d88f60e5b83721894 which was trying to pass NULL to the the '.service' default. Anyway, it seems better to be explicit.
-rw-r--r--src/systemctl/systemctl.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 263755fec7..4299429fbd 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2701,7 +2701,10 @@ static int expand_names(sd_bus *bus, char **names, const char* suffix, char ***r
STRV_FOREACH(name, names) {
char *t;
- t = unit_name_mangle_with_suffix(*name, MANGLE_GLOB, suffix);
+ if (suffix)
+ t = unit_name_mangle_with_suffix(*name, MANGLE_GLOB, suffix);
+ else
+ t = unit_name_mangle(*name, MANGLE_GLOB);
if (!t)
return log_oom();