Disable workaround pending completion of updated TLS]
support in non-production releases.
+20070131
+
+ Assorted code cleanup, portability fixes/workarounds, and
+ minor updates: global/dict_ldap.c, mantools/postlink,
+ tlsmgs/tlsmgr.c, conf/master.cf. LaMont Jones.
+
Wish list:
Update message content length when adding/removing headers.
# maildrop. See the Postfix MAILDROP_README file for details.
# Also specify in main.cf: maildrop_destination_recipient_limit=1
#
-maildrop unix - n n - - pipe
- flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}
+#maildrop unix - n n - - pipe
+# flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}
+#
+# ====================================================================
#
# The Cyrus deliver program has changed incompatibly, multiple times.
#
-old-cyrus unix - n n - - pipe
- flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
+#old-cyrus unix - n n - - pipe
+# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
+#
+# ====================================================================
+#
# Cyrus 2.1.5 (Amos Gouaux)
# Also specify in main.cf: cyrus_destination_recipient_limit=1
-cyrus unix - n n - - pipe
- user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
+#
+#cyrus unix - n n - - pipe
+# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
+#
+# ====================================================================
#
# See the Postfix UUCP_README file for configuration details.
#
-uucp unix - n n - - pipe
- flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
+#uucp unix - n n - - pipe
+# flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
+#
+# ====================================================================
#
# Other external delivery methods.
#
-ifmail unix - n n - - pipe
- flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
-bsmtp unix - n n - - pipe
- flags=Fq. user=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
+#ifmail unix - n n - - pipe
+# flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
+#
+#bsmtp unix - n n - - pipe
+# flags=Fq. user=bsmtp argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
+#
+#scalemail-backend unix - n n - 2 pipe
+# flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store
+# ${nexthop} ${user} ${extension}
+#
+#mailman unix - n n - - pipe
+# flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
+# ${nexthop} ${user}
$html_directory/SMTPD_POLICY_README.html:f:root:-:644
$html_directory/SMTPD_PROXY_README.html:f:root:-:644
$html_directory/STANDARD_CONFIGURATION_README.html:f:root:-:644
+$html_directory/TLS_LEGACY_README.html:f:root:-:644
$html_directory/TLS_README.html:f:root:-:644
$html_directory/TUNING_README.html:f:root:-:644
$html_directory/ULTRIX_README.html:f:root:-:644
while (<>) {
chop;
- # Glue together words that were broken across line breaks.
-
- Again:
- if (/-[<\/bB>]*$/) {
- $_ .= "\n";
- $len1 = length;
- $_ .= <>;
- chop if $len1 < length;
- goto Again;
+ # Glue together words that were broken across line breaks. The
+ # "label: if_block" was generated by a sed-to-perl converter; the
+ # braces around this are a workaround for buggy implementations.
+
+ {
+ Again:
+ if (/-[<\/bB>]*$/) {
+ $_ .= "\n";
+ $len1 = length;
+ $_ .= <>;
+ chop if $len1 < length;
+ goto Again;
+ }
}
if (/<[Aa] *[HhNn][RrAa][EeMm][FfEe] *=/) {
print;
static void rfc2253_quote(DICT *unused, const char *name, VSTRING *result)
{
- unsigned char *sub = (unsigned char *)name;
- size_t len;
+ const char *sub = name;
+ size_t len;
/*
- * The RFC only requires quoting of a leading or trailing space,
- * but it is harmless to quote whitespace everywhere. Similarly,
- * we quote all '#' characters, even though only the leading '#'
- * character requires quoting per the RFC.
+ * The RFC only requires quoting of a leading or trailing space, but it
+ * is harmless to quote whitespace everywhere. Similarly, we quote all
+ * '#' characters, even though only the leading '#' character requires
+ * quoting per the RFC.
*/
while (*sub)
- if ((len = strcspn(sub, " \t\"#+,;<>\\")) > 0) {
+ if ((len = strcspn(sub, " \t\"#+,;<>\\")) > 0) {
vstring_strncat(result, sub, len);
sub += len;
} else
- vstring_sprintf_append(result, "\\%02X", *(sub++));
+ vstring_sprintf_append(result, "\\%02X",
+ *((const unsigned char *) sub++));
}
/* rfc2254_quote - Quote input key for safe inclusion in the query filter */
static void rfc2254_quote(DICT *unused, const char *name, VSTRING *result)
{
- unsigned char *sub = (unsigned char *)name;
- size_t len;
+ const char *sub = name;
+ size_t len;
/*
* If any characters in the supplied address should be escaped per RFC
* parameter and then this more comprehensive mechanism.
*/
while (*sub)
- if ((len = strcspn(sub, "*()\\")) > 0) {
+ if ((len = strcspn(sub, "*()\\")) > 0) {
vstring_strncat(result, sub, len);
sub += len;
} else
- vstring_sprintf_append(result, "\\%02X", *(sub++));
+ vstring_sprintf_append(result, "\\%02X",
+ *((const unsigned char *) sub++));
}
static BINHASH *conn_hash = 0;
static int dict_ldap_result(LDAP *ld, int msgid, int timeout, LDAPMessage **res)
{
- int rc;
struct timeval mytimeval;
mytimeval.tv_sec = timeout;
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
-#define MAIL_RELEASE_DATE "20070125"
+#define MAIL_RELEASE_DATE "20070131"
#define MAIL_VERSION_NUMBER "2.4"
#ifdef SNAPSHOT
0, TLS_CIPHER_NONE,
};
+#if 0
+
typedef struct {
char *algorithm;
char *exclusion;
0, 0,
};
+#endif
+
/*
* Parsed OpenSSL version number.
*/
{
const char *myname = "tls_cipher_list";
static VSTRING *buf;
+#if 0
static ARGV *exclude_unavailable;
cipher_probe *probe;
int i;
+#endif
va_list ap;
const char *exclude;
char *tok;
* Tunables.
*/
char *var_tls_rand_source;
+int var_tls_daemon_rand_bytes;
int var_tls_rand_bytes;
int var_tls_reseed_period;
int var_tls_prng_exch_period;
projects / thirdparty / postfix.git / commitdiff
