From 3f0da4d03a40f701ea463d944022b337ca2b098e Mon Sep 17 00:00:00 2001
From: Nigel Metheringham <nigel@exim.org>
Date: Wed, 6 Feb 2008 12:44:58 +0000
Subject: [PATCH] Close the socket used by the dovecot authenticator.  Fixes:
 #667

---
 doc/doc-txt/ChangeLog   | 4 +++-
 src/src/auths/dovecot.c | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 93a0c8347..df6e7470a 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.541 2008/01/30 20:09:23 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.542 2008/02/06 12:44:58 nm4 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -22,6 +22,8 @@ TF/02 Bugzilla 662: Fix stack corruption before exec() in daemon.c.
 NM/03 Bugzilla 602: exicyclog now handles panic log, and creates empty
       log files in place.  Contributed by Roberto Lima
 
+NM/04 Bugzilla 667: close socket used by dovecot authenticator
+
 
 Exim version 4.69
 -----------------
diff --git a/src/src/auths/dovecot.c b/src/src/auths/dovecot.c
index a260109fb..adc466ab6 100644
--- a/src/src/auths/dovecot.c
+++ b/src/src/auths/dovecot.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/auths/dovecot.c,v 1.8 2008/01/18 12:23:26 nm4 Exp $ */
+/* $Cambridge: exim/src/src/auths/dovecot.c,v 1.9 2008/02/06 12:44:59 nm4 Exp $ */
 
 /*
  * Copyright (c) 2004 Andrey Panin <pazke@donpac.ru>
@@ -369,6 +369,9 @@ int auth_dovecot_server(auth_instance *ablock, uschar *data)
        }
 
 out:
+       /* close the socket used by dovecot */
+       if (fd >= 0)
+              close(fd);
 
        /* Expand server_condition as an authorization check */
        return (ret == OK)? auth_check_serv_cond(ablock) : ret;
-- 
2.30.2