From 796ba5549416b8a2c037da1d40fa76cb1a53f5df Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Apr 2011 01:26:39 +0200
Subject: unit: fix assert when trying to load unit instances for
 uninstanciable types

http://lists.freedesktop.org/archives/systemd-devel/2011-April/001910.html
---
 src/unit.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/unit.c b/src/unit.c
index aed25e4f21..b7ff0c51fe 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -118,8 +118,10 @@ int unit_add_name(Unit *u, const char *text) {
         if ((r = unit_name_to_instance(s, &i)) < 0)
                 goto fail;
 
-        if (i && unit_vtable[t]->no_instances)
+        if (i && unit_vtable[t]->no_instances) {
+                r = -EINVAL;
                 goto fail;
+        }
 
         /* Ensure that this unit is either instanced or not instanced,
          * but not both. */
-- 
cgit v1.2.3-54-g00ecf