From d99ecb7731438a538cc1c65a582f17a6d9391708 Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Mon, 14 Mar 2005 00:00:00 -0500 Subject: [PATCH] postfix-2.3-20050314 --- postfix/HISTORY | 5 +++++ postfix/README_FILES/SMTPD_POLICY_README | 11 +++++------ postfix/conf/postfix-files | 4 ++++ postfix/html/SMTPD_POLICY_README.html | 15 ++++++++------- postfix/proto/SMTPD_POLICY_README.html | 15 ++++++++------- postfix/src/global/mail_version.h | 2 +- postfix/src/postalias/postalias.c | 2 +- postfix/src/postmap/postmap.c | 2 +- postfix/src/util/dict_db.c | 8 +++++++- 9 files changed, 40 insertions(+), 24 deletions(-) diff --git a/postfix/HISTORY b/postfix/HISTORY index acd8a7703..a948d2b45 100644 --- 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 a76a773ac..4cdca8b4b 100644 --- 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 16127a5d5..4db90eded 100644 --- 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 7279933a2..18d5bc225 100644 --- a/postfix/html/SMTPD_POLICY_README.html +++ b/postfix/html/SMTPD_POLICY_README.html @@ -128,9 +128,14 @@ size=12345 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: @@ -146,10 +151,6 @@ size=12345 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 diff --git a/postfix/proto/SMTPD_POLICY_README.html b/postfix/proto/SMTPD_POLICY_README.html index 4c7315a3d..dade4b8fc 100644 --- a/postfix/proto/SMTPD_POLICY_README.html +++ b/postfix/proto/SMTPD_POLICY_README.html @@ -128,9 +128,14 @@ size=12345 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: @@ -146,10 +151,6 @@ size=12345 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 diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 2c0bc7fb7..27ffbbc08 100644 --- 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 a29b4e75f..2fa055b11 100644 --- 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 a033a02f5..ef6ebcda6 100644 --- 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 cf0bbefb3..4acf9224e 100644 --- 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: