ph10 2005/04/05 15:02:30 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src/auths cyrus_sasl.c
Log:
cyrus_sasl authenticator was not using the expanded hostname (even
though it did expand it :-)
Revision Changes Path
1.109 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.2 +3 -2 exim/exim-src/src/auths/cyrus_sasl.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- ChangeLog 5 Apr 2005 13:58:34 -0000 1.108
+++ ChangeLog 5 Apr 2005 14:02:30 -0000 1.109
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.108 2005/04/05 13:58:34 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.109 2005/04/05 14:02:30 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -121,6 +121,9 @@
PH/22 Added support for macro redefinition, and (re)definition in between
driver and ACL definitions.
+
+PH/23 The cyrus_sasl authenticator was expanding server_hostname, but then
+ forgetting to use the resulting value; it was using the unexpanded value.
A note about Exim versions 4.44 and 4.50
Index: cyrus_sasl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/auths/cyrus_sasl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyrus_sasl.c 7 Oct 2004 13:10:01 -0000 1.1
+++ cyrus_sasl.c 5 Apr 2005 14:02:30 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/auths/cyrus_sasl.c,v 1.1 2004/10/07 13:10:01 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/auths/cyrus_sasl.c,v 1.2 2005/04/05 14:02:30 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -190,8 +190,9 @@
return DEFER;
}
-rc=sasl_server_new(CS ob->server_service, CS ob->server_hostname,
- CS ob->server_realm, NULL, NULL, NULL, 0, &conn);
+rc=sasl_server_new(CS ob->server_service, CS hname, CS ob->server_realm, NULL,
+ NULL, NULL, 0, &conn);
+
if( rc != SASL_OK )
{
auth_defer_msg = US"couldn't initialise Cyrus SASL connection";
