postfix-2.3-20050314

diff --git a/postfix/HISTORY b/postfix/HISTORY
index acd8a770398b52eacc6647f786ca3fdf9174ef31..a948d2b453fbcf69bc62bc0832649ecd6fdb7f35 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -10475,6 +10475,11 @@ Apologies for any names omitted.
        delete the right entry. Problem found by Victor Duchovni,
        more problems found by Wietse. File: tls/tls_scache.c.
 
+20050314
+
+       Portability: Berkeley DB changed API from version 2.5 to
+       2.6. Rob Foehl. File: util/dict_db.c.
+
 Open problems:
 
        Med: disable header address rewriting after XCLIENT?

diff --git a/postfix/README_FILES/SMTPD_POLICY_README b/postfix/README_FILES/SMTPD_POLICY_README
index a76a773accbcc8c605b4e6a6f0f1c2c9e3978275..4cdca8b4b60290c7d139869000dc49bff4d65023 100644 (file)
--- a/postfix/README_FILES/SMTPD_POLICY_README
+++ b/postfix/README_FILES/SMTPD_POLICY_README
@@ -86,8 +86,11 @@ Notes:
     Postfix 2.2 and later, it specifies the actual message size when the client
     sends the END-OF-DATA command.
 
-  * The "sasl_*" attributes specify information about how the client was
-    authenticated via SASL.
+  * The "sasl_*" attributes (Postfix 2.2 and later) specify information about
+    how the client was authenticated via SASL.
+
+  * The "ccert_*" attributes (Postfix 2.2 and later) specify information about
+    how the client was authenticated via TLS.
 
 The following is specific to SMTPD delegated policy requests:
 
@@ -97,10 +100,6 @@ The following is specific to SMTPD delegated policy requests:
     VRFY or ETRN; these are the SMTP protocol states where the Postfix SMTP
     server makes an OK/REJECT/HOLD/etc. decision.
 
-  * The "ccert_*" attributes specify information from the client TLS
-    certificate. This information is presented only if the client certificate
-    was successfully verified.
-
 The policy server replies with any action that is allowed in a Postfix SMTPD
 access(5) table. Example:
 

diff --git a/postfix/conf/postfix-files b/postfix/conf/postfix-files
index 16127a5d574c7b152a8ac1dbef0617a28e02901f..4db90eded2a9a73addac22f146426c6f9041416f 100644 (file)
--- a/postfix/conf/postfix-files
+++ b/postfix/conf/postfix-files
@@ -225,6 +225,8 @@ $readme_directory/ADDRESS_VERIFICATION_README:f:root:-:644
 $readme_directory/BACKSCATTER_README:f:root:-:644
 $readme_directory/BASIC_CONFIGURATION_README:f:root:-:644
 $readme_directory/BUILTIN_FILTER_README:f:root:-:644
+$readme_directory/CDB_README:f:root:-:644
+$readme_directory/CONNECTION_CACHE_README:f:root:-:644
 $readme_directory/CONTENT_INSPECTION_README:f:root:-:644
 $readme_directory/DATABASE_README:f:root:-:644
 $readme_directory/DB_README:f:root:-:644
@@ -270,6 +272,8 @@ $html_directory/ADDRESS_VERIFICATION_README.html:f:root:-:644
 $html_directory/BACKSCATTER_README.html:f:root:-:644
 $html_directory/BASIC_CONFIGURATION_README.html:f:root:-:644
 $html_directory/BUILTIN_FILTER_README.html:f:root:-:644
+$html_directory/CDB_README.html:f:root:-:644
+$html_directory/CONNECTION_CACHE_README.html:f:root:-:644
 $html_directory/CONTENT_INSPECTION_README.html:f:root:-:644
 $html_directory/CYRUS_README.html:f:root:-:644
 $html_directory/DATABASE_README.html:f:root:-:644

diff --git a/postfix/html/SMTPD_POLICY_README.html b/postfix/html/SMTPD_POLICY_README.html
index 7279933a2d3acc7cc5f989338d94a81ca8675613..18d5bc225d7cf4c4577c771d4c030821208ec1f3 100644 (file)
--- a/postfix/html/SMTPD_POLICY_README.html
+++ b/postfix/html/SMTPD_POLICY_README.html
@@ -128,9 +128,14 @@ size=12345
     command.
     </p>
 
-    <li> <p> The "sasl_*" attributes specify information about how
-    the client was authenticated via SASL. </p>
- 
+    <li> <p> The "sasl_*" attributes (Postfix 2.2 and later) specify
+    information about how the client was authenticated via SASL.
+    </p>
+
+    <li> <p> The "ccert_*" attributes (Postfix 2.2 and later) specify
+    information about how the client was authenticated via TLS.
+    </p>
+
 </ul>
 
 <p> The following is specific to SMTPD delegated policy requests:
@@ -146,10 +151,6 @@ size=12345
     the Postfix SMTP server makes an OK/REJECT/HOLD/etc. decision.
     </p>
 
-    <li> <p> The "ccert_*" attributes specify information from the
-    client TLS certificate. This information is presented only
-    if the client certificate was successfully verified. </p>
-
 </ul>
 
 <p> The policy server replies with any action that is allowed in a

diff --git a/postfix/proto/SMTPD_POLICY_README.html b/postfix/proto/SMTPD_POLICY_README.html
index 4c7315a3d2c419e98fe8096025f900c5ea9d2771..dade4b8fc29b1beabdc190bbea7e67e7fcfa8359 100644 (file)
--- a/postfix/proto/SMTPD_POLICY_README.html
+++ b/postfix/proto/SMTPD_POLICY_README.html
@@ -128,9 +128,14 @@ size=12345
     command.
     </p>
 
-    <li> <p> The "sasl_*" attributes specify information about how
-    the client was authenticated via SASL. </p>
- 
+    <li> <p> The "sasl_*" attributes (Postfix 2.2 and later) specify
+    information about how the client was authenticated via SASL.
+    </p>
+
+    <li> <p> The "ccert_*" attributes (Postfix 2.2 and later) specify
+    information about how the client was authenticated via TLS.
+    </p>
+
 </ul>
 
 <p> The following is specific to SMTPD delegated policy requests:
@@ -146,10 +151,6 @@ size=12345
     the Postfix SMTP server makes an OK/REJECT/HOLD/etc. decision.
     </p>
 
-    <li> <p> The "ccert_*" attributes specify information from the
-    client TLS certificate. This information is presented only
-    if the client certificate was successfully verified. </p>
-
 </ul>
 
 <p> The policy server replies with any action that is allowed in a

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 2c0bc7fb7c78fe2c113d8baf19f19a5185ebbf97..27ffbbc08c1812c540bb54c7e9f5236197815e67 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change the patchlevel and the release date. Snapshots change the
   * release date only.
   */
-#define MAIL_RELEASE_DATE      "20050313"
+#define MAIL_RELEASE_DATE      "20050314"
 #define MAIL_VERSION_NUMBER    "2.3"
 
 #define VAR_MAIL_VERSION       "mail_version"

diff --git a/postfix/src/postalias/postalias.c b/postfix/src/postalias/postalias.c
index a29b4e75fecfffc8270e889be2c0f29a3da3ad0d..2fa055b111330a6c05882bd437b3172ffdfb2df6 100644 (file)
--- a/postfix/src/postalias/postalias.c
+++ b/postfix/src/postalias/postalias.c
@@ -582,7 +582,7 @@ static void postalias_seq(const char *map_type, const char *map_name)
 
 static NORETURN usage(char *myname)
 {
-    msg_fatal("usage: %s [-Nfinorvw] [-c config_dir] [-d key] [-q key] [map_type:]file...",
+    msg_fatal("usage: %s [-Nfinoprsvw] [-c config_dir] [-d key] [-q key] [map_type:]file...",
              myname);
 }
 

diff --git a/postfix/src/postmap/postmap.c b/postfix/src/postmap/postmap.c
index a033a02f5bafd7d863b36461c5e47d059830e42d..ef6ebcda65470687aa2bcbf691d375145cc8bef2 100644 (file)
--- a/postfix/src/postmap/postmap.c
+++ b/postfix/src/postmap/postmap.c
@@ -529,7 +529,7 @@ static void postmap_seq(const char *map_type, const char *map_name)
 
 static NORETURN usage(char *myname)
 {
-    msg_fatal("usage: %s [-Nfinorvw] [-c config_dir] [-d key] [-q key] [map_type:]file...",
+    msg_fatal("usage: %s [-Nfinoprsvw] [-c config_dir] [-d key] [-q key] [map_type:]file...",
              myname);
 }
 

diff --git a/postfix/src/util/dict_db.c b/postfix/src/util/dict_db.c
index cf0bbefb37126307d92c56784f74a3ac83ebfd8e..4acf9224e104dbaff0b6a8b663232793339a6298 100644 (file)
--- a/postfix/src/util/dict_db.c
+++ b/postfix/src/util/dict_db.c
@@ -89,6 +89,12 @@
 #define DONT_CLOBBER                   DB_NOOVERWRITE
 #endif
 
+#if (DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 6)
+#define DICT_DB_CURSOR(db, curs)       (db)->cursor((db), NULL, (curs))
+#else
+#define DICT_DB_CURSOR(db, curs)       (db)->cursor((db), NULL, (curs), 0);
+#endif
+
 #ifndef DB_FCNTL_LOCKING
 #define DB_FCNTL_LOCKING               0
 #endif
@@ -400,7 +406,7 @@ static int dict_db_sequence(DICT *dict, int function,
     switch (function) {
     case DICT_SEQ_FUN_FIRST:
        if (dict_db->cursor == 0)
-           db->cursor(db, NULL, &(dict_db->cursor), 0);
+           DICT_DB_CURSOR(db, &(dict_db->cursor));
        db_function = DB_FIRST;
        break;
     case DICT_SEQ_FUN_NEXT: