Module Name: src Committed By: bouyer Date: Wed May 21 21:42:40 UTC 2014
Modified Files: src/external/ibm-public/postfix/dist [netbsd-6]: HISTORY src/external/ibm-public/postfix/dist/README_FILES [netbsd-6]: MULTI_INSTANCE_README SASL_README src/external/ibm-public/postfix/dist/conf [netbsd-6]: post-install src/external/ibm-public/postfix/dist/html [netbsd-6]: MULTI_INSTANCE_README.html SASL_README.html src/external/ibm-public/postfix/dist/proto [netbsd-6]: MULTI_INSTANCE_README.html SASL_README.html src/external/ibm-public/postfix/dist/src/global [netbsd-6]: mail_version.h src/external/ibm-public/postfix/dist/src/postconf [netbsd-6]: postconf.c src/external/ibm-public/postfix/dist/src/tls [netbsd-6]: tls_misc.c src/external/ibm-public/postfix/dist/src/util [netbsd-6]: dict_pcre.c Log Message: external/ibm-public/postfix/dist/HISTORY patch external/ibm-public/postfix/dist/README_FILES/MULTI_INSTANCE_README patch external/ibm-public/postfix/dist/README_FILES/SASL_README patch external/ibm-public/postfix/dist/conf/post-install patch external/ibm-public/postfix/dist/html/MULTI_INSTANCE_README.html patch external/ibm-public/postfix/dist/html/SASL_README.html patch external/ibm-public/postfix/dist/proto/MULTI_INSTANCE_README.html patch external/ibm-public/postfix/dist/proto/SASL_README.html patch external/ibm-public/postfix/dist/src/global/mail_version.h patch external/ibm-public/postfix/dist/src/postconf/postconf.c patch external/ibm-public/postfix/dist/src/tls/tls_misc.c patch external/ibm-public/postfix/dist/src/util/dict_pcre.c patch Update to version 2.8.17: - The postconf '-#' option reset prior options instead of adding to them. - Correct an error in MULTI_INSTANCE_README Makefile example. - Correct an error in SASL_README PostgreSQL example. [tron, ticket #1024] To generate a diff of this commit: cvs rdiff -u -r1.1.1.12.2.6 -r1.1.1.12.2.7 \ src/external/ibm-public/postfix/dist/HISTORY cvs rdiff -u -r1.1.1.2 -r1.1.1.2.4.1 \ src/external/ibm-public/postfix/dist/README_FILES/MULTI_INSTANCE_README cvs rdiff -u -r1.1.1.3 -r1.1.1.3.6.1 \ src/external/ibm-public/postfix/dist/README_FILES/SASL_README cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \ src/external/ibm-public/postfix/dist/conf/post-install cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \ src/external/ibm-public/postfix/dist/html/MULTI_INSTANCE_README.html cvs rdiff -u -r1.1.1.3 -r1.1.1.3.6.1 \ src/external/ibm-public/postfix/dist/html/SASL_README.html cvs rdiff -u -r1.1.1.2 -r1.1.1.2.4.1 \ src/external/ibm-public/postfix/dist/proto/MULTI_INSTANCE_README.html cvs rdiff -u -r1.1.1.3 -r1.1.1.3.6.1 \ src/external/ibm-public/postfix/dist/proto/SASL_README.html cvs rdiff -u -r1.1.1.12.2.6 -r1.1.1.12.2.7 \ src/external/ibm-public/postfix/dist/src/global/mail_version.h cvs rdiff -u -r1.1.1.4 -r1.1.1.4.6.1 \ src/external/ibm-public/postfix/dist/src/postconf/postconf.c cvs rdiff -u -r1.1.1.3.6.2 -r1.1.1.3.6.3 \ src/external/ibm-public/postfix/dist/src/tls/tls_misc.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.12.1 \ src/external/ibm-public/postfix/dist/src/util/dict_pcre.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/ibm-public/postfix/dist/HISTORY diff -u src/external/ibm-public/postfix/dist/HISTORY:1.1.1.12.2.6 src/external/ibm-public/postfix/dist/HISTORY:1.1.1.12.2.7 --- src/external/ibm-public/postfix/dist/HISTORY:1.1.1.12.2.6 Sun Oct 20 12:58:25 2013 +++ src/external/ibm-public/postfix/dist/HISTORY Wed May 21 21:42:39 2014 @@ -16938,3 +16938,36 @@ Apologies for any names omitted. each smtpd(8) process. The workaround turns off session tickets. In 2.11 we'll enable session tickets properly. Viktor Dukhovni. File: tls/tls_server.c. + +20131026 + + Future proofing: API changes in the PCRE library. File: + util/dict_pcre.c. + +20131127 + + Bugfix (introduced: 20090106): the postconf '-#' option + erased prior options. File: postconf/postconf.c. + +20131129 + + Bugfix: Makefile example in MULTI_INSTANCE_README. Viktor + Dukhovni. File: proto/MULTI_INSTANCE_README.html. + +20131216 + + OpenSSL future proofing: tolerate disappearance of named + bug-workaround bits without invalidating tls_disable_workarounds + configurations. When support for a bug workaround is removed + from OpenSSL, the corresponding bit is defined as zero (i.e. + NOOP) instead of causing programs to break. Viktor Dukhovni. + File: tls/tls_misc.c. + +20131220 + + Documentation: typo in SASL_README. Patrick Ben Koetter. + File: proto/SASL_README.html. + +20140104 + + Bugfix: malformed error message. File: conf/post-install. Index: src/external/ibm-public/postfix/dist/README_FILES/MULTI_INSTANCE_README diff -u src/external/ibm-public/postfix/dist/README_FILES/MULTI_INSTANCE_README:1.1.1.2 src/external/ibm-public/postfix/dist/README_FILES/MULTI_INSTANCE_README:1.1.1.2.4.1 --- src/external/ibm-public/postfix/dist/README_FILES/MULTI_INSTANCE_README:1.1.1.2 Sun Jul 31 10:01:49 2011 +++ src/external/ibm-public/postfix/dist/README_FILES/MULTI_INSTANCE_README Wed May 21 21:42:39 2014 @@ -177,7 +177,7 @@ database when none exists. generic: Makefile @echo Creating $@ @rm -f $@.tmp - @printf '%s\t%s+root=%s\n' root $MTAADMIN `uname -n` > $@.tmp + @printf '%s\t%s+root=%s\n' root ${MTAADMIN} `uname -n` > $@.tmp @mv $@.tmp generic %.cdb: % @@ -492,8 +492,8 @@ Shared among all instances: $readme_directory. * Entries in /etc/passwd and /etc/group for the $mail_owner user and - $setgid_group group. The the $mail_owner user provides the mail system with - a protected (non-root) execution context. The $setgid_group group is used + $setgid_group group. The $mail_owner user provides the mail system with a + protected (non-root) execution context. The $setgid_group group is used exclusively to support the setgid postdrop(1) and postqueue(1) utilities (it mmuusstt nnoott be the primary group or secondary group of any users, including the $mail_owner user). Index: src/external/ibm-public/postfix/dist/README_FILES/SASL_README diff -u src/external/ibm-public/postfix/dist/README_FILES/SASL_README:1.1.1.3 src/external/ibm-public/postfix/dist/README_FILES/SASL_README:1.1.1.3.6.1 --- src/external/ibm-public/postfix/dist/README_FILES/SASL_README:1.1.1.3 Wed Mar 2 19:31:29 2011 +++ src/external/ibm-public/postfix/dist/README_FILES/SASL_README Wed May 21 21:42:39 2014 @@ -444,7 +444,7 @@ to a PostgreSQL server: sql_user: username sql_passwd: secret sql_database: dbname - sql_select: SELECT password FROM users WHERE user = '%u'@'%r' + sql_select: SELECT password FROM users WHERE user = '%u@%r' NNoottee Index: src/external/ibm-public/postfix/dist/conf/post-install diff -u src/external/ibm-public/postfix/dist/conf/post-install:1.1.1.2 src/external/ibm-public/postfix/dist/conf/post-install:1.1.1.2.6.1 --- src/external/ibm-public/postfix/dist/conf/post-install:1.1.1.2 Wed Mar 2 19:31:33 2011 +++ src/external/ibm-public/postfix/dist/conf/post-install Wed May 21 21:42:39 2014 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: post-install,v 1.1.1.2 2011/03/02 19:31:33 tron Exp $ +# $NetBSD: post-install,v 1.1.1.2.6.1 2014/05/21 21:42:39 bouyer Exp $ # # To view the formatted manual page of this file, type: @@ -466,7 +466,7 @@ test -n "$create" && { case $type in [hl]) continue;; [df]) ;; - *) echo unknown type $type for $path in $daemon_directory/postfix-files1>&2; exit 1;; + *) echo unknown type $type for $path in $daemon_directory/postfix-files 1>&2; exit 1;; esac # Expand $name, and canonicalize null fields. for name in path owner group flags Index: src/external/ibm-public/postfix/dist/html/MULTI_INSTANCE_README.html diff -u src/external/ibm-public/postfix/dist/html/MULTI_INSTANCE_README.html:1.1.1.3 src/external/ibm-public/postfix/dist/html/MULTI_INSTANCE_README.html:1.1.1.3.4.1 --- src/external/ibm-public/postfix/dist/html/MULTI_INSTANCE_README.html:1.1.1.3 Sun Jul 31 10:01:58 2011 +++ src/external/ibm-public/postfix/dist/html/MULTI_INSTANCE_README.html Wed May 21 21:42:40 2014 @@ -233,7 +233,7 @@ creates a "generic" database when none e generic: Makefile @echo Creating $@ @rm -f $@.tmp - @printf '%s\t%s+root=%s\n' root $MTAADMIN `uname -n` > $@.tmp + @printf '%s\t%s+root=%s\n' root ${MTAADMIN} `uname -n` > $@.tmp @mv $@.tmp generic %.<a href="CDB_README.html">cdb</a>: % @@ -620,7 +620,7 @@ $<a href="postconf.5.html#daemon_directo $<a href="postconf.5.html#manpage_directory">manpage_directory</a> and $<a href="postconf.5.html#readme_directory">readme_directory</a>. </p> <li><p> Entries in /etc/passwd and /etc/group for the $<a href="postconf.5.html#mail_owner">mail_owner</a> user and -$<a href="postconf.5.html#setgid_group">setgid_group</a> group. The the $<a href="postconf.5.html#mail_owner">mail_owner</a> user provides the mail system +$<a href="postconf.5.html#setgid_group">setgid_group</a> group. The $<a href="postconf.5.html#mail_owner">mail_owner</a> user provides the mail system with a protected (non-root) execution context. The $<a href="postconf.5.html#setgid_group">setgid_group</a> group is used exclusively to support the setgid <a href="postdrop.1.html">postdrop(1)</a> and <a href="postqueue.1.html">postqueue(1)</a> utilities (it <b>must not</b> be the primary group or secondary group Index: src/external/ibm-public/postfix/dist/html/SASL_README.html diff -u src/external/ibm-public/postfix/dist/html/SASL_README.html:1.1.1.3 src/external/ibm-public/postfix/dist/html/SASL_README.html:1.1.1.3.6.1 --- src/external/ibm-public/postfix/dist/html/SASL_README.html:1.1.1.3 Wed Mar 2 19:31:37 2011 +++ src/external/ibm-public/postfix/dist/html/SASL_README.html Wed May 21 21:42:40 2014 @@ -739,7 +739,7 @@ and connects it to a PostgreSQL server: sql_user: username sql_passwd: secret sql_database: dbname - sql_select: SELECT password FROM users WHERE user = '%u'@'%r' + sql_select: SELECT password FROM users WHERE user = '%u@%r' </pre> </blockquote> Index: src/external/ibm-public/postfix/dist/proto/MULTI_INSTANCE_README.html diff -u src/external/ibm-public/postfix/dist/proto/MULTI_INSTANCE_README.html:1.1.1.2 src/external/ibm-public/postfix/dist/proto/MULTI_INSTANCE_README.html:1.1.1.2.4.1 --- src/external/ibm-public/postfix/dist/proto/MULTI_INSTANCE_README.html:1.1.1.2 Sun Jul 31 10:02:21 2011 +++ src/external/ibm-public/postfix/dist/proto/MULTI_INSTANCE_README.html Wed May 21 21:42:40 2014 @@ -233,7 +233,7 @@ creates a "generic" database when none e generic: Makefile @echo Creating $@ @rm -f $@.tmp - @printf '%s\t%s+root=%s\n' root $MTAADMIN `uname -n` > $@.tmp + @printf '%s\t%s+root=%s\n' root ${MTAADMIN} `uname -n` > $@.tmp @mv $@.tmp generic %.cdb: % @@ -620,7 +620,7 @@ $daemon_directory. </p> $manpage_directory and $readme_directory. </p> <li><p> Entries in /etc/passwd and /etc/group for the $mail_owner user and -$setgid_group group. The the $mail_owner user provides the mail system +$setgid_group group. The $mail_owner user provides the mail system with a protected (non-root) execution context. The $setgid_group group is used exclusively to support the setgid postdrop(1) and postqueue(1) utilities (it <b>must not</b> be the primary group or secondary group Index: src/external/ibm-public/postfix/dist/proto/SASL_README.html diff -u src/external/ibm-public/postfix/dist/proto/SASL_README.html:1.1.1.3 src/external/ibm-public/postfix/dist/proto/SASL_README.html:1.1.1.3.6.1 --- src/external/ibm-public/postfix/dist/proto/SASL_README.html:1.1.1.3 Wed Mar 2 19:32:01 2011 +++ src/external/ibm-public/postfix/dist/proto/SASL_README.html Wed May 21 21:42:40 2014 @@ -739,7 +739,7 @@ and connects it to a PostgreSQL server: sql_user: username sql_passwd: secret sql_database: dbname - sql_select: SELECT password FROM users WHERE user = '%u'@'%r' + sql_select: SELECT password FROM users WHERE user = '%u@%r' </pre> </blockquote> Index: src/external/ibm-public/postfix/dist/src/global/mail_version.h diff -u src/external/ibm-public/postfix/dist/src/global/mail_version.h:1.1.1.12.2.6 src/external/ibm-public/postfix/dist/src/global/mail_version.h:1.1.1.12.2.7 --- src/external/ibm-public/postfix/dist/src/global/mail_version.h:1.1.1.12.2.6 Sun Oct 20 12:58:25 2013 +++ src/external/ibm-public/postfix/dist/src/global/mail_version.h Wed May 21 21:42:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mail_version.h,v 1.1.1.12.2.6 2013/10/20 12:58:25 bouyer Exp $ */ +/* $NetBSD: mail_version.h,v 1.1.1.12.2.7 2014/05/21 21:42:40 bouyer Exp $ */ #ifndef _MAIL_VERSION_H_INCLUDED_ #define _MAIL_VERSION_H_INCLUDED_ @@ -22,8 +22,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20130905" -#define MAIL_VERSION_NUMBER "2.8.16" +#define MAIL_RELEASE_DATE "20140116" +#define MAIL_VERSION_NUMBER "2.8.17" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE Index: src/external/ibm-public/postfix/dist/src/postconf/postconf.c diff -u src/external/ibm-public/postfix/dist/src/postconf/postconf.c:1.1.1.4 src/external/ibm-public/postfix/dist/src/postconf/postconf.c:1.1.1.4.6.1 --- src/external/ibm-public/postfix/dist/src/postconf/postconf.c:1.1.1.4 Wed May 11 09:11:06 2011 +++ src/external/ibm-public/postfix/dist/src/postconf/postconf.c Wed May 21 21:42:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: postconf.c,v 1.1.1.4 2011/05/11 09:11:06 tron Exp $ */ +/* $NetBSD: postconf.c,v 1.1.1.4.6.1 2014/05/21 21:42:40 bouyer Exp $ */ /*++ /* NAME @@ -1159,7 +1159,7 @@ int main(int argc, char **argv) break; #endif case '#': - cmd_mode = COMMENT_OUT; + cmd_mode |= COMMENT_OUT; break; case 'h': Index: src/external/ibm-public/postfix/dist/src/tls/tls_misc.c diff -u src/external/ibm-public/postfix/dist/src/tls/tls_misc.c:1.1.1.3.6.2 src/external/ibm-public/postfix/dist/src/tls/tls_misc.c:1.1.1.3.6.3 --- src/external/ibm-public/postfix/dist/src/tls/tls_misc.c:1.1.1.3.6.2 Sat Sep 7 16:28:34 2013 +++ src/external/ibm-public/postfix/dist/src/tls/tls_misc.c Wed May 21 21:42:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: tls_misc.c,v 1.1.1.3.6.2 2013/09/07 16:28:34 bouyer Exp $ */ +/* $NetBSD: tls_misc.c,v 1.1.1.3.6.3 2014/05/21 21:42:40 bouyer Exp $ */ /*++ /* NAME @@ -232,59 +232,72 @@ static const NAME_CODE protocol_table[] #define NAMEBUG(x) #x, SSL_OP_##x static const LONG_NAME_MASK ssl_bug_tweaks[] = { -#if defined(SSL_OP_MICROSOFT_SESS_ID_BUG) - NAMEBUG(MICROSOFT_SESS_ID_BUG), /* 0x00000001L */ +#ifndef SSL_OP_MICROSOFT_SESS_ID_BUG +#define SSL_OP_MICROSOFT_SESS_ID_BUG 0 #endif + NAMEBUG(MICROSOFT_SESS_ID_BUG), -#if defined(SSL_OP_NETSCAPE_CHALLENGE_BUG) - NAMEBUG(NETSCAPE_CHALLENGE_BUG), /* 0x00000002L */ +#ifndef SSL_OP_NETSCAPE_CHALLENGE_BUG +#define SSL_OP_NETSCAPE_CHALLENGE_BUG 0 #endif + NAMEBUG(NETSCAPE_CHALLENGE_BUG), -#if defined(SSL_OP_LEGACY_SERVER_CONNECT) - NAMEBUG(LEGACY_SERVER_CONNECT), /* 0x00000004L */ +#ifndef SSL_OP_LEGACY_SERVER_CONNECT +#define SSL_OP_LEGACY_SERVER_CONNECT 0 #endif + NAMEBUG(LEGACY_SERVER_CONNECT), -#if defined(SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) - NAMEBUG(NETSCAPE_REUSE_CIPHER_CHANGE_BUG), /* 0x00000008L */ - "CVE-2010-4180", SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG, +#ifndef SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG +#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0 #endif + NAMEBUG(NETSCAPE_REUSE_CIPHER_CHANGE_BUG), + "CVE-2010-4180", SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG, -#if defined(SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG) - NAMEBUG(SSLREF2_REUSE_CERT_TYPE_BUG), /* 0x00000010L */ +#ifndef SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG +#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0 #endif + NAMEBUG(SSLREF2_REUSE_CERT_TYPE_BUG), -#if defined(SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER) - NAMEBUG(MICROSOFT_BIG_SSLV3_BUFFER),/* 0x00000020L */ +#ifndef SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER +#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0 #endif + NAMEBUG(MICROSOFT_BIG_SSLV3_BUFFER), -#if defined(SSL_OP_MSIE_SSLV2_RSA_PADDING) - NAMEBUG(MSIE_SSLV2_RSA_PADDING), /* 0x00000040L */ - "CVE-2005-2969", SSL_OP_MSIE_SSLV2_RSA_PADDING, +#ifndef SSL_OP_MSIE_SSLV2_RSA_PADDING +#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0 #endif + NAMEBUG(MSIE_SSLV2_RSA_PADDING), + "CVE-2005-2969", SSL_OP_MSIE_SSLV2_RSA_PADDING, -#if defined(SSL_OP_SSLEAY_080_CLIENT_DH_BUG) - NAMEBUG(SSLEAY_080_CLIENT_DH_BUG), /* 0x00000080L */ +#ifndef SSL_OP_SSLEAY_080_CLIENT_DH_BUG +#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0 #endif + NAMEBUG(SSLEAY_080_CLIENT_DH_BUG), -#if defined(SSL_OP_TLS_D5_BUG) - NAMEBUG(TLS_D5_BUG), /* 0x00000100L */ +#ifndef SSL_OP_TLS_D5_BUG +#define SSL_OP_TLS_D5_BUG 0 #endif + NAMEBUG(TLS_D5_BUG), -#if defined(SSL_OP_TLS_BLOCK_PADDING_BUG) - NAMEBUG(TLS_BLOCK_PADDING_BUG), /* 0x00000200L */ +#ifndef SSL_OP_TLS_BLOCK_PADDING_BUG +#define SSL_OP_TLS_BLOCK_PADDING_BUG 0 #endif + NAMEBUG(TLS_BLOCK_PADDING_BUG), -#if defined(SSL_OP_TLS_ROLLBACK_BUG) - NAMEBUG(TLS_ROLLBACK_BUG), /* 0x00000400L */ +#ifndef SSL_OP_TLS_ROLLBACK_BUG +#define SSL_OP_TLS_ROLLBACK_BUG 0 #endif + NAMEBUG(TLS_ROLLBACK_BUG), -#if defined(SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) - NAMEBUG(DONT_INSERT_EMPTY_FRAGMENTS), /* 0x00000800L */ +#ifndef SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS +#define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0 #endif + NAMEBUG(DONT_INSERT_EMPTY_FRAGMENTS), -#if defined(SSL_OP_CRYPTOPRO_TLSEXT_BUG) - NAMEBUG(CRYPTOPRO_TLSEXT_BUG), /* 0x80000000L */ +#ifndef SSL_OP_CRYPTOPRO_TLSEXT_BUG +#define SSL_OP_CRYPTOPRO_TLSEXT_BUG 0 #endif + NAMEBUG(CRYPTOPRO_TLSEXT_BUG), 0, 0, }; @@ -804,7 +817,8 @@ long tls_bug_bits(void) long bits = SSL_OP_ALL; /* Work around all known bugs */ long mask; -#if OPENSSL_VERSION_NUMBER >= 0x00908000L +#if OPENSSL_VERSION_NUMBER >= 0x00908000L && \ + OPENSSL_VERSION_NUMBER < 0x10000000L long lib_version = SSLeay(); /* @@ -830,6 +844,10 @@ long tls_bug_bits(void) bits &= ~long_name_mask_opt(VAR_TLS_BUG_TWEAKS, ssl_bug_tweaks, var_tls_bug_tweaks, NAME_MASK_ANY_CASE | NAME_MASK_NUMBER | NAME_MASK_WARN); +#ifdef SSL_OP_SAFARI_ECDHE_ECDSA_BUG + /* Not relevant to SMTP */ + bits &= ~SSL_OP_SAFARI_ECDHE_ECDSA_BUG; +#endif } return (bits); } Index: src/external/ibm-public/postfix/dist/src/util/dict_pcre.c diff -u src/external/ibm-public/postfix/dist/src/util/dict_pcre.c:1.1.1.1 src/external/ibm-public/postfix/dist/src/util/dict_pcre.c:1.1.1.1.12.1 --- src/external/ibm-public/postfix/dist/src/util/dict_pcre.c:1.1.1.1 Tue Jun 23 10:08:59 2009 +++ src/external/ibm-public/postfix/dist/src/util/dict_pcre.c Wed May 21 21:42:40 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: dict_pcre.c,v 1.1.1.1 2009/06/23 10:08:59 tron Exp $ */ +/* $NetBSD: dict_pcre.c,v 1.1.1.1.12.1 2014/05/21 21:42:40 bouyer Exp $ */ /*++ /* NAME @@ -62,6 +62,15 @@ #include "pcre.h" /* + * Backwards compatibility. + */ +#ifdef PCRE_STUDY_JIT_COMPILE +#define DICT_PCRE_FREE_STUDY(x) pcre_free_study(x) +#else +#define DICT_PCRE_FREE_STUDY(x) pcre_free((char *) (x)) +#endif + + /* * Support for IF/ENDIF based on an idea by Bert Driehuis. */ #define DICT_PCRE_OP_MATCH 1 /* Match this regexp */ @@ -389,7 +398,7 @@ static void dict_pcre_close(DICT *dict) if (match_rule->pattern) myfree((char *) match_rule->pattern); if (match_rule->hints) - myfree((char *) match_rule->hints); + DICT_PCRE_FREE_STUDY(match_rule->hints); if (match_rule->replacement) myfree((char *) match_rule->replacement); break; @@ -398,7 +407,7 @@ static void dict_pcre_close(DICT *dict) if (if_rule->pattern) myfree((char *) if_rule->pattern); if (if_rule->hints) - myfree((char *) if_rule->hints); + DICT_PCRE_FREE_STUDY(if_rule->hints); break; case DICT_PCRE_OP_ENDIF: break; @@ -679,7 +688,7 @@ static DICT_PCRE_RULE *dict_pcre_parse_r if (engine.pattern) myfree((char *) engine.pattern); if (engine.hints) - myfree((char *) engine.hints); + DICT_PCRE_FREE_STUDY(engine.hints); CREATE_MATCHOP_ERROR_RETURN(0); } #endif