mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-30 13:48:06 +00:00
Code Issues Releases Wiki Activity

postfix-2.6-20080903

Browse Source
This commit is contained in:
Wietse Venema
2008-09-03 00:00:00 -05:00
committed by Viktor Dukhovni
parent 07a26488b9
commit 295accce09
8 changed files with 140 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
postfix/HISTORY
View File

@@ -14634,3 +14634,11 @@ Apologies for any names omitted.
implement a denial of service attack on Postfix. Data
confidentiality and integrity are not affected. File:
util/events.c.
20080903
Don't enable kqueue (which requires poll) support on
MacOS X. File: makedefs.
Cleanup: remove obsolete Rhapsody and MacOS targets from
makedefs.

3
postfix/html/postconf.5.html
View File

@@ -6108,7 +6108,8 @@ you really want to match subdomains.
<p>
Restrict the use of the <a href="postconf.5.html#permit_mx_backup">permit_mx_backup</a> SMTP access feature to
only domains whose primary MX hosts match the listed networks.
</p>
The parameter value syntax is the same as with the <a href="postconf.5.html#mynetworks">mynetworks</a>
parameter; note, however, that the default value is empty. </p>
</DD>

6
postfix/html/smtp-sink.1.html
View File

@@ -114,9 +114,11 @@ SMTP-SINK(1) SMTP-SINK(1)
descriptors. Excess connections will stay queued in
the TCP/IP stack.
<b>-M</b> <i>count</i>
Terminate after receiving <i>count</i> messages.
<b>-n</b> <i>count</i>
Terminate after <i>count</i> sessions. This is for testing
purposes.
Terminate after <i>count</i> sessions.
<b>-p</b> Do not announce support for ESMTP command pipelin-
ing.

118
postfix/makedefs
View File

@@ -408,68 +408,64 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
[1-6].*) CCARGS="$CCARGS -DNO_IPV6";;
*) CCARGS="$CCARGS -DBIND_8_COMPAT -DNO_NETINFO";;
esac
# Darwin 8.11.1 has kqueue support, but let's play safe
case $RELEASE in
[1-8].*) CCARGS="$CCARGS -DNO_KQUEUE";;
*) trap 'rm -f makedefs.test makedefs.test.[co]' 1 2 3 15
cat >makedefs.test.c <<'EOF'
/* Adapted from libevent. */
#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#ifndef EV_SET
#define EV_SET(kp, id, fi, fl, ffl, da, ud) do { \
struct kevent *__kp = (kp); \
__kp->ident = (id); \
__kp->filter = (fi); \
__kp->flags = (fl); \
__kp->fflags = (ffl); \
__kp->data = (da); \
__kp->udata = (ud); \
} while(0)
#endif
int main(int argc, char **argv)
{
int kq;
struct kevent test_change;
struct kevent test_result;
if ((kq = kqueue()) < 0) {
perror("kqueue");
exit(1);
}
#define TEST_FD (-1)
EV_SET(&test_change, TEST_FD, EVFILT_READ, EV_ADD, 0, 0, 0);
if (kevent(kq,
&test_change, sizeof(test_change) / sizeof(struct kevent),
&test_result, sizeof(test_result) / sizeof(struct kevent),
(struct timespec *) 0) != 1 ||
test_result.ident != TEST_FD ||
test_result.flags != EV_ERROR) {
fprintf(stderr, "Error: kevent reports errors incorrectly\n");
exit(1);
}
exit(0);
}
EOF
$CC -o makedefs.test makedefs.test.c || exit 1
./makedefs.test 2>/dev/null ||
# kqueue and/or poll are broken up to and including MacOS X 10.5
CCARGS="$CCARGS -DNO_KQUEUE"
rm -f makedefs.test makedefs.test.[co];;
esac
;;
Rhapsody.5*|"Mac OS".10*)
SYSTYPE=MACOSX
# Use the native compiler by default
: ${CC=cc}
AWK=gawk
# # Darwin 8.11.1 has kqueue support, but let's play safe
# case $RELEASE in
# [1-8].*) CCARGS="$CCARGS -DNO_KQUEUE";;
# *) trap 'rm -f makedefs.test makedefs.test.[co]' 1 2 3 15
# cat >makedefs.test.c <<'EOF'
#/* Adapted from libevent. */
#
##include <sys/types.h>
##include <sys/event.h>
##include <sys/time.h>
##include <string.h>
##include <stdlib.h>
##include <stdio.h>
#
##ifndef EV_SET
##define EV_SET(kp, id, fi, fl, ffl, da, ud) do { \
# struct kevent *__kp = (kp); \
# __kp->ident = (id); \
# __kp->filter = (fi); \
# __kp->flags = (fl); \
# __kp->fflags = (ffl); \
# __kp->data = (da); \
# __kp->udata = (ud); \
# } while(0)
##endif
#
#int main(int argc, char **argv)
#{
# int kq;
# struct kevent test_change;
# struct kevent test_result;
#
# if ((kq = kqueue()) < 0) {
# perror("kqueue");
# exit(1);
# }
##define TEST_FD (-1)
#
# EV_SET(&test_change, TEST_FD, EVFILT_READ, EV_ADD, 0, 0, 0);
# if (kevent(kq,
# &test_change, sizeof(test_change) / sizeof(struct kevent),
# &test_result, sizeof(test_result) / sizeof(struct kevent),
# (struct timespec *) 0) != 1 ||
# test_result.ident != TEST_FD ||
# test_result.flags != EV_ERROR) {
# fprintf(stderr, "Error: kevent reports errors incorrectly\n");
# exit(1);
# }
# exit(0);
#}
#EOF
# $CC -o makedefs.test makedefs.test.c || exit 1
# ./makedefs.test 2>/dev/null ||
# CCARGS="$CCARGS -DNO_KQUEUE"
# rm -f makedefs.test makedefs.test.[co];;
# esac
;;
dcosx.1*) SYSTYPE=DCOSX1
RANLIB=echo

4
postfix/man/man1/smtp-sink.1
View File

@@ -102,8 +102,10 @@ An upper bound on the maximal number of simultaneous
connections that \fBsmtp-sink\fR will handle. This prevents
the process from running out of file descriptors. Excess
connections will stay queued in the TCP/IP stack.
.IP "\fB-M \fIcount\fR"
Terminate after receiving \fIcount\fR messages.
.IP "\fB-n \fIcount\fR"
Terminate after \fIcount\fR sessions. This is for testing purposes.
Terminate after \fIcount\fR sessions.
.IP \fB-p\fR
Do not announce support for ESMTP command pipelining.
.IP \fB-P\fR

2
postfix/man/man5/postconf.5
View File

@@ -3409,6 +3409,8 @@ you really want to match subdomains.
.SH permit_mx_backup_networks (default: empty)
Restrict the use of the permit_mx_backup SMTP access feature to
only domains whose primary MX hosts match the listed networks.
The parameter value syntax is the same as with the mynetworks
parameter; note, however, that the default value is empty.
.SH pickup_service_name (default: pickup)
The name of the \fBpickup\fR(8) service. This service picks up local mail
submissions from the Postfix maildrop queue.

3
postfix/proto/postconf.proto
View File

@@ -7281,7 +7281,8 @@ mailing lists.
<p>
Restrict the use of the permit_mx_backup SMTP access feature to
only domains whose primary MX hosts match the listed networks.
</p>
The parameter value syntax is the same as with the mynetworks
parameter; note, however, that the default value is empty. </p>
%PARAM pickup_service_name pickup

2
postfix/src/global/mail_version.h
View File

@@ -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 "20080902"
#define MAIL_RELEASE_DATE "20080903"
#define MAIL_VERSION_NUMBER "2.6"
#ifdef SNAPSHOT