postfix-2.5-20070525

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 3b57177c4735b538e176cac4a0c856aa84a1ff0b..091c48df137aadf68a12a7b0aed169820bc025a2 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -13563,6 +13563,11 @@ Apologies for any names omitted.
        Duchovni. Files: smtpd/smtpd.c xsasl/xsasl_cyrus_server.c,
        (and xsasl/xsasl_cyrus_client.c for future expansion).
 
+20070525
+
+       Bugfix (introduced 20070523) the sasl_set_path() function
+       name was mis-speeled.
+
 Wish list:
 
        Update attr_print/scan() so they can send/receive file

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 2e40735c9d77d026dbaa767a4a308163c40c7eda..d11c13f5e980bb66a793dffd8cf5c85a5962b75b 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20070524"
+#define MAIL_RELEASE_DATE      "20070525"
 #define MAIL_VERSION_NUMBER    "2.5"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/xsasl/xsasl_cyrus_client.c b/postfix/src/xsasl/xsasl_cyrus_client.c
index 1b6f0257db551711d55f65e8b8493320cf83b22c..536de273965793cbb7f5b76ee7560a4afbe08341 100644 (file)
--- a/postfix/src/xsasl/xsasl_cyrus_client.c
+++ b/postfix/src/xsasl/xsasl_cyrus_client.c
@@ -259,7 +259,7 @@ XSASL_CLIENT_IMPL *xsasl_cyrus_client_init(const char *unused_client_type,
 
     if (*var_cyrus_conf_path) {
 #ifdef SASL_PATH_TYPE_CONFIG                   /* Cyrus SASL 2.1.22 */
-       if (set_sasl_path(SASL_PATH_TYPE_CONFIG,
+       if (sasl_set_path(SASL_PATH_TYPE_CONFIG,
                          var_cyrus_conf_path) != SASL_OK)
            msg_warn("failed to set Cyrus SASL configuration path: \"%s\"",
                     var_cyrus_conf_path);

diff --git a/postfix/src/xsasl/xsasl_cyrus_server.c b/postfix/src/xsasl/xsasl_cyrus_server.c
index 0cd6aa3839ff317374d1354e1561448cfc629d1d..d3b80210791804f5111bb181639e85b3089c19f6 100644 (file)
--- a/postfix/src/xsasl/xsasl_cyrus_server.c
+++ b/postfix/src/xsasl/xsasl_cyrus_server.c
@@ -215,7 +215,7 @@ XSASL_SERVER_IMPL *xsasl_cyrus_server_init(const char *unused_server_type,
 
     if (*var_cyrus_conf_path) {
 #ifdef SASL_PATH_TYPE_CONFIG                   /* Cyrus SASL 2.1.22 */
-       if (set_sasl_path(SASL_PATH_TYPE_CONFIG,
+       if (sasl_set_path(SASL_PATH_TYPE_CONFIG,
                          var_cyrus_conf_path) != SASL_OK)
            msg_warn("failed to set Cyrus SASL configuration path: \"%s\"",
                     var_cyrus_conf_path);