From: Maria Matejka <mq@ucw.cz>
Date: Fri, 27 Jun 2025 17:41:35 +0000 (+0200)
Subject: Merge commit 'f11f15e82' into thread-next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d31a353ff2360822f4b65a07935badcb8a467f15;p=thirdparty%2Fbird.git

Merge commit 'f11f15e82' into thread-next
---

d31a353ff2360822f4b65a07935badcb8a467f15
diff --cc sysdep/unix/main.c
index 2e5987f97,deb108c30..2137f0b67
--- a/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)