Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/mLib

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/mLib:
  Release 2.2.5.
  sel/ident.c: Don't close the descriptor twice on immediate connect failure.

diff --git a/debian/changelog b/debian/changelog
index fa10942279f74713867500dfd317dc8ee3ed4e46..c8155425509c4576cb8293c35261aa6c2a001517 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,12 @@ mlib (2.3.0) experimental; urgency=medium
 
  -- Mark Wooding <mdw@distorted.org.uk>  Tue, 12 Jun 2018 00:30:47 +0100
 
+mlib (2.2.5) experimental; urgency=medium
+
+  * ident: Only close the socket once if connection fails early.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Sat, 09 Jun 2018 17:40:21 +0100
+
 mlib (2.2.4) experimental; urgency=medium
 
   * debian: Update for Debhelper 9.

diff --git a/sel/ident.c b/sel/ident.c
index f8ce0c7bd384a108ebdfa15fcd0f015748fa97fd..0017f0a3877faef70c4d36d975245caa47b22f07 100644 (file)
--- a/sel/ident.c
+++ b/sel/ident.c
@@ -282,7 +282,7 @@ static void go(ident_request *rq)
   sin.sin_addr = rq->remote.sin_addr;
   if (conn_init(&rq->c, rq->s, fd, (struct sockaddr *)&sin, sizeof(sin),
                connected, rq))
-    goto fail_1;
+    goto fail_0;
 
   /* --- Finish off initializing the block --- */