From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Tue, 5 Apr 2005 14:02:30 +0000 (+0000)
Subject: cyrus_sasl authenticator was not using the expanded hostname (even
X-Git-Tag: exim-4_51~29
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=acb1b3461349256ee2422aa39b6f2d810681ae47;p=exim.git

cyrus_sasl authenticator was not using the expanded hostname (even
though it did expand it :-)
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index ff8c2835d..8a7274491 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.108 2005/04/05 13:58:34 ph10 Exp $
+$Cambridge: 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
 -------------------------------------------
@@ -122,6 +122,9 @@ PH/21 Added acl_not_smtp_mime to allow for MIME scanning for non-SMTP messages.
 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
 ----------------------------------------
diff --git a/src/src/auths/cyrus_sasl.c b/src/src/auths/cyrus_sasl.c
index 4d75aa434..849c3d1c0 100644
--- a/src/src/auths/cyrus_sasl.c
+++ b/src/src/auths/cyrus_sasl.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/auths/cyrus_sasl.c,v 1.1 2004/10/07 13:10:01 ph10 Exp $ */
+/* $Cambridge: 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 @@ if (rc != SASL_OK)
   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";