From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 28 Nov 2014 17:25:09 +0000 (-0500)
Subject: Revert "systemctl: append default suffix only if none present"
X-Git-Tag: v218~245
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e80733be33e52d8ab2f1ae845326d39c600f5612;hp=23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41

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.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 263755fec..4299429fb 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();