sd-daemon: extend return value logic of sd_notify()

[elogind.git] / src / dbus-manager.c

diff --git a/src/dbus-manager.c b/src/dbus-manager.c
index c80b22b9e67f368af02f19d15165e428b3c47f44..d4c9e8f0e2cfa91863f98cf1b1d6297fd9efae49 100644 (file)
--- a/src/dbus-manager.c
+++ b/src/dbus-manager.c
@@ -626,7 +626,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection  *connection
                         return bus_send_error_reply(m, message, NULL, r);
                 }
 
-                e = strv_env_merge(m->environment, l, NULL);
+                e = strv_env_merge(2, m->environment, l);
                 strv_free(l);
 
                 if (!e)
@@ -650,7 +650,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection  *connection
                         return bus_send_error_reply(m, message, NULL, r);
                 }
 
-                e = strv_env_delete(m->environment, l, NULL);
+                e = strv_env_delete(m->environment, 1, l);
                 strv_free(l);
 
                 if (!e)