summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNigel Metheringham <nigel@exim.org>2008-01-18 12:23:26 +0000
committerNigel Metheringham <nigel@exim.org>2008-01-18 12:23:26 +0000
commitdeafd5b336b87fdf2e96ad3a4334c211ea369af0 (patch)
tree7d2e28f6f3abe9ff62b529560c01fcd0dc3d6cb0
parent0caec8e792b969ca442413e75c8966f074bc5fd4 (diff)
Minor fixes to the dovecot authenticator. Fixes: #646
-rw-r--r--doc/doc-txt/ChangeLog7
-rw-r--r--src/src/auths/dovecot.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 6891c5f3b..776151b24 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.537 2008/01/17 12:56:13 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.538 2008/01/18 12:23:26 nm4 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -11,6 +11,11 @@ NM/01 Bugzilla 657: Embedded PCRE removed from the exim source tree.
PCRE is a system library on the majority of modern systems.
See entry on PCRE_LIBS in EDITME file.
+NM/02 Bugzilla 646: Removed unwanted C/R in Dovecot authenticator
+ conversation. Added nologin parameter to request.
+ Patch contributed by Kirill Miazine
+
+
Exim version 4.69
-----------------
diff --git a/src/src/auths/dovecot.c b/src/src/auths/dovecot.c
index c9433741a..a260109fb 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.7 2007/03/01 14:06:56 ph10 Exp $ */
+/* $Cambridge: exim/src/src/auths/dovecot.c,v 1.8 2008/01/18 12:23:26 nm4 Exp $ */
/*
* Copyright (c) 2004 Andrey Panin <pazke@donpac.ru>
@@ -280,7 +280,7 @@ int auth_dovecot_server(auth_instance *ablock, uschar *data)
****************************************************************************/
auth_command = string_sprintf("VERSION\t%d\t%d\nCPID\t%d\n"
- "AUTH\t%d\t%s\tservice=smtp\t%srip=%s\tlip=%s\tresp=%s\n",
+ "AUTH\t%d\t%s\tservice=smtp\t%srip=%s\tlip=%s\tnologin\tresp=%s\n",
VERSION_MAJOR, VERSION_MINOR, getpid(), cuid,
ablock->public_name, auth_extra_data, sender_host_address,
interface_address, data ? (char *) data : "");
@@ -323,7 +323,7 @@ int auth_dovecot_server(auth_instance *ablock, uschar *data)
goto out;
}
- temp = string_sprintf("CONT\t%d\t%s\r\n", cuid, data);
+ temp = string_sprintf("CONT\t%d\t%s\n", cuid, data);
if (write(fd, temp, Ustrlen(temp)) < 0)
OUT("authentication socket write error");
break;