X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=execute.c;h=a36e52b34554595a962adff9214ce7df63499243;hb=4e85aff465b2ce0fa34222e52a6f5a984140b22e;hp=ef24f71a253d0f369c9644689bdcb2c2af73c1b8;hpb=bab45044482dc012331c768c08d78a2d006485ad;p=elogind.git

diff --git a/execute.c b/execute.c
index ef24f71a2..a36e52b34 100644
--- a/execute.c
+++ b/execute.c
@@ -1035,6 +1035,8 @@ int exec_spawn(ExecCommand *command,
                                 goto fail;
                         }
 
+                assert(n_env <= 6);
+
                 if (!(final_env = strv_env_merge(environment, our_env, context->environment, NULL))) {
                         r = EXIT_MEMORY;
                         goto fail;
@@ -1062,10 +1064,7 @@ int exec_spawn(ExecCommand *command,
          * sure that when we kill the cgroup the process will be
          * killed too). */
         if (cgroup_bondings)
-                if ((r = cgroup_bonding_install_list(cgroup_bondings, pid)) < 0) {
-                        r = EXIT_CGROUP;
-                        goto fail;
-                }
+                cgroup_bonding_install_list(cgroup_bondings, pid);
 
         log_debug("Forked %s as %llu", command->path, (unsigned long long) pid);