Merge commit 'f11f15e82' into thread-next

diff --cc sysdep/unix/main.c
index 2e5987f97f0f5c6f5b8220768830b1edc2e39ea6,deb108c30370b4fe282f9e07c0333e497a971690..2137f0b67ad5d5690e8f6af2fe201ccdeb675b40
--- 1/sysdep/unix/main.c
--- 2/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@@ -591,10 -579,10 +591,10 @@@ cli_listen(struct cli_config *cf
    /* Return value intentionally ignored */
    unlink(cf->name);
  
 -  if (sk_open_unix(s, cf->name) < 0)
 +  if (sk_open_unix(s, &main_birdloop, cf->name) < 0)
    {
      log(L_ERR "Cannot create control socket %s: %m", cf->name);
-     return NULL;
+     goto err;
    }
  
    if (cf->uid || cf->gid)