nm4 2008/01/18 12:23:26 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src/auths dovecot.c
Log:
Minor fixes to the dovecot authenticator. Fixes: #646
Revision Changes Path
1.538 +5 -0 exim/exim-doc/doc-txt/ChangeLog
1.8 +2 -2 exim/exim-src/src/auths/dovecot.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.537
retrieving revision 1.538
diff -u -r1.537 -r1.538
--- ChangeLog 17 Jan 2008 12:56:13 -0000 1.537
+++ ChangeLog 18 Jan 2008 12:23:26 -0000 1.538
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.537 2008/01/17 12:56:13 nm4 Exp $
+$Cambridge: exim/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 @@
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
-----------------
Index: dovecot.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/auths/dovecot.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dovecot.c 1 Mar 2007 14:06:56 -0000 1.7
+++ dovecot.c 18 Jan 2008 12:23:26 -0000 1.8
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/auths/dovecot.c,v 1.7 2007/03/01 14:06:56 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/auths/dovecot.c,v 1.8 2008/01/18 12:23:26 nm4 Exp $ */
/*
* Copyright (c) 2004 Andrey Panin <pazke@???>
@@ -280,7 +280,7 @@
****************************************************************************/
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 @@
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;