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

snapshot-19991117

Browse Source
This commit is contained in:
Wietse Venema 1999-11-17 00:00:00 -05:00
parent 406e23a161
commit c9f1fff7b4
31 changed files with 398 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
postfix/HISTORY
View File

@ -3240,3 +3240,19 @@ Apologies for any names omitted.
The edit is done on a copy, and the copy is renamed into The edit is done on a copy, and the copy is renamed into
the place of the original. File: postconf/postconf.c, the place of the original. File: postconf/postconf.c,
util/readlline.[hc]. util/readlline.[hc].
19991117
Feature: on systems with h_errno, the "reject_unknown_client"
restriction now distinguishes between soft errors (always
reply with 450) and hard errors (use the user-specified
reply code). This should lessen the load by broken mailers
that re-connect once a minute.
Feature: forward/reverse name/address check for SMTP client
hostnames. This fends off some hypothetical attacks by
spammers who are in control of their own reverse mapping.
Robustness: postconf no longer aborts when it can't figure
out the local domain name; it prints a warning instead.
This allows you to use "postconf -e" to fix the problem.

140
postfix/INSTALL.sh
View File

@ -6,21 +6,40 @@
PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc
umask 022 umask 022
# Workaround, should edit main.cf in place. # Default settings, edit to taste or change interactively. Once this
trap 'rm -f ./main.cf; exit' 0 1 2 3 15 # script has run it saves settings to $config_directory/install.cf.
config_directory=/etc/postfix
daemon_directory=/usr/libexec/postfix
command_directory=/usr/sbin
queue_directory=/var/spool/postfix
sendmail_path=/usr/sbin/sendmail
newaliases_path=/usr/bin/newaliases
mailq_path=/usr/bin/mailq
mail_owner=postfix
setgid=no
manpages=no
# Load defaults from existing installation.
test -f $config_directory/main.cf && {
for name in daemon_directory command_directory queue_directory mail_owner
do
eval "$name=\"\`bin/postconf -h $name || kill \$\$\`\""
done
}
test -f $config_directory/install.cf && . $config_directory/install.cf
cat <<EOF cat <<EOF
Warning: this script replaces existing sendmail or Postfix programs. Warning: this script replaces existing sendmail or Postfix programs.
Make backups if you want to be able to recover. Make backups if you want to be able to recover.
Otherwise, the script should be safe for installing or upgrading In addition to doing a fresh install, this script can change an
Postfix. Existing configuration and queue files are left alone; existing installation from using a world-writable maildrop to a
existing program files and scripts are replaced, not overwritten. group-writable one. It cannot be used to change Postfix queue
This is safe unless you are sharing files over NFS. ownership.
In particular, this script can be used to change Postfix from using
a world-writable maildrop to a group-writable one.
Before installing files, this script prompts you for some definitions. Before installing files, this script prompts you for some definitions.
You can either edit this script ahead of time, or you can specify You can either edit this script ahead of time, or you can specify
@ -35,54 +54,13 @@ your changes interactively.
newaliases_path - full pathname of the Postfix newaliases command. newaliases_path - full pathname of the Postfix newaliases command.
mailq_path - full pathname of the Postfix mailq command. mailq_path - full pathname of the Postfix mailq command.
owner - owner of Postfix queue files. mail_owner - owner of Postfix queue files.
setgid - groupname, e.g., postdrop (default: no). See INSTALL section 12. setgid - groupname, e.g., postdrop (default: no). See INSTALL section 12.
manpages - path to man tree (default: no). Example: /usr/local/man. manpages - path to man tree (default: no). Example: /usr/local/man.
EOF EOF
# Default settings, edit to taste or change interactively. Once this
# script has run it saves settings to $config_directory/install.cf.
# *BSD, LINUX
config_directory=/etc/postfix
daemon_directory=/usr/libexec/postfix
command_directory=/usr/sbin
queue_directory=/var/spool/postfix
sendmail_path=/usr/sbin/sendmail
newaliases_path=/usr/bin/newaliases
mailq_path=/usr/bin/mailq
owner=postfix
setgid=no
manpages=no
# Solaris, System V.4
#config_directory=/etc/postfix
#daemon_directory=/usr/lib/postfix
#command_directory=/usr/sbin
#queue_directory=/var/spool/postfix
#sendmail_path=/usr/lib/sendmail
#newaliases_path=/usr/bin/newaliases
#mailq_path=/usr/bin/mailq
#owner=postfix
#setgid=no
#manpages=no
# SunOS 4
#config_directory=/etc/postfix
#daemon_directory=/usr/lib/postfix
#command_directory=/usr/etc
#queue_directory=/var/spool/postfix
#sendmail_path=/usr/lib/sendmail
#newaliases_path=/usr/ucb/newaliases
#mailq_path=/usr/ucb/mailq
#owner=postfix
#setgid=no
#manpages=no
test -f $config_directory/install.cf && . $config_directory/install.cf
# By now, shells must have functions. Ultrix users must use sh5 or lose. # By now, shells must have functions. Ultrix users must use sh5 or lose.
compare_or_replace() { compare_or_replace() {
@ -115,7 +93,7 @@ case `echo -n` in
esac esac
for name in config_directory daemon_directory command_directory \ for name in config_directory daemon_directory command_directory \
queue_directory sendmail_path newaliases_path mailq_path owner \ queue_directory sendmail_path newaliases_path mailq_path mail_owner \
setgid manpages setgid manpages
do do
while : while :
@ -141,28 +119,6 @@ do
esac esac
done done
# Workaround, should edit main.cf in place.
test -f $config_directory/main.cf || {
echo "mail_owner = $owner" >./main.cf
echo "myhostname = xx.yy" >>./main.cf
alt_main="-c ."
}
bin/postmap $alt_main -q "$owner" unix:passwd.byname >/dev/null || {
echo "$owner needs an entry in the passwd file" 1>&2
echo "Remember, $owner must have a dedicated user id and group id." 1>&2
exit 1
}
case $setgid in
no) ;;
*) bin/postmap $alt_main -q "$setgid" unix:group.byname >/dev/null || {
echo "$setgid needs an entry in the group file" 1>&2
echo "Remember, $setgid must have a dedicated group id." 1>&2
exit 1
}
esac
# Create any missing directories. # Create any missing directories.
test -d $config_directory || mkdir -p $config_directory || exit 1 test -d $config_directory || mkdir -p $config_directory || exit 1
@ -170,18 +126,6 @@ test -d $daemon_directory || mkdir -p $daemon_directory || exit 1
test -d $command_directory || mkdir -p $command_directory || exit 1 test -d $command_directory || mkdir -p $command_directory || exit 1
test -d $queue_directory || mkdir -p $queue_directory || exit 1 test -d $queue_directory || mkdir -p $queue_directory || exit 1
# Save settings.
(echo "# This file was generated by $0"
for name in config_directory daemon_directory command_directory \
queue_directory sendmail_path newaliases_path mailq_path owner \
setgid manpages
do
eval echo $name=\$$name
done) >junk || exit 1
compare_or_move a+x,go-w junk $config_directory/install.cf || exit 1
rm -f junk
# Install files. Be careful to not copy over running programs. # Install files. Be careful to not copy over running programs.
for file in `ls libexec` for file in `ls libexec`
@ -205,12 +149,6 @@ compare_or_replace a+r,go-w conf/LICENSE $config_directory/LICENSE || exit 1
test -f $config_directory/main.cf || { test -f $config_directory/main.cf || {
cp conf/* $config_directory || exit 1 cp conf/* $config_directory || exit 1
chmod a+r,go-w $config_directory/* || exit 1 chmod a+r,go-w $config_directory/* || exit 1
sed "
s;^daemon_directory .*;daemon_directory = $daemon_directory;
s;^command_directory .*;command_directory = $command_directory;
s;^queue_directory .*;queue_directory = $queue_directory;
s;^mail_owner .*;mail_owner = $owner;
" conf/main.cf >$config_directory/main.cf || exit 1
echo "Warning: you still need to edit myorigin/mydestination in" 1>&2 echo "Warning: you still need to edit myorigin/mydestination in" 1>&2
echo "$config_directory/main.cf. See also html/faq.html for dialup" 1>&2 echo "$config_directory/main.cf. See also html/faq.html for dialup" 1>&2
@ -220,6 +158,24 @@ test -f $config_directory/main.cf || {
echo "for root and postmaster, then run the newaliases command." 1>&2 echo "for root and postmaster, then run the newaliases command." 1>&2
} }
# Save settings.
postconf -e \
"daemon_directory = $daemon_directory" \
"command_directory = $command_directory" \
"queue_directory = $queue_directory" \
"mail_owner = $mail_owner" \
|| exit 1
(echo "# This file was generated by $0"
for name in config_directory sendmail_path newaliases_path mailq_path \
setgid manpages
do
eval echo $name=\$$name
done) >junk || exit 1
compare_or_move a+x,go-w junk $config_directory/install.cf || exit 1
rm -f junk
# Use set-gid privileges instead of writable maildrop (optional). # Use set-gid privileges instead of writable maildrop (optional).
test -d $queue_directory/maildrop || { test -d $queue_directory/maildrop || {

4
postfix/cleanup/Makefile.in
View File

@ -69,6 +69,7 @@ cleanup.o: ../include/vstream.h
cleanup.o: ../include/mymalloc.h cleanup.o: ../include/mymalloc.h
cleanup.o: ../include/iostuff.h cleanup.o: ../include/iostuff.h
cleanup.o: ../include/dict.h cleanup.o: ../include/dict.h
cleanup.o: ../include/argv.h
cleanup.o: ../include/mail_conf.h cleanup.o: ../include/mail_conf.h
cleanup.o: ../include/cleanup_user.h cleanup.o: ../include/cleanup_user.h
cleanup.o: ../include/mail_queue.h cleanup.o: ../include/mail_queue.h
@ -81,7 +82,6 @@ cleanup.o: ../include/mail_addr.h
cleanup.o: ../include/ext_prop.h cleanup.o: ../include/ext_prop.h
cleanup.o: ../include/mail_server.h cleanup.o: ../include/mail_server.h
cleanup.o: cleanup.h cleanup.o: cleanup.h
cleanup.o: ../include/argv.h
cleanup.o: ../include/maps.h cleanup.o: ../include/maps.h
cleanup.o: ../include/tok822.h cleanup.o: ../include/tok822.h
cleanup.o: ../include/resolve_clnt.h cleanup.o: ../include/resolve_clnt.h
@ -133,10 +133,10 @@ cleanup_map11.o: ../include/vstring.h
cleanup_map11.o: ../include/vbuf.h cleanup_map11.o: ../include/vbuf.h
cleanup_map11.o: ../include/dict.h cleanup_map11.o: ../include/dict.h
cleanup_map11.o: ../include/vstream.h cleanup_map11.o: ../include/vstream.h
cleanup_map11.o: ../include/argv.h
cleanup_map11.o: ../include/mymalloc.h cleanup_map11.o: ../include/mymalloc.h
cleanup_map11.o: ../include/cleanup_user.h cleanup_map11.o: ../include/cleanup_user.h
cleanup_map11.o: ../include/mail_addr_map.h cleanup_map11.o: ../include/mail_addr_map.h
cleanup_map11.o: ../include/argv.h
cleanup_map11.o: ../include/maps.h cleanup_map11.o: ../include/maps.h
cleanup_map11.o: ../include/quote_822_local.h cleanup_map11.o: ../include/quote_822_local.h
cleanup_map11.o: cleanup.h cleanup_map11.o: cleanup.h

7
postfix/dns/dns.h
View File

@ -46,6 +46,13 @@
(cp) += 4; \ (cp) += 4; \
} }
#endif
/*
* SunOS 4 needs this.
*/
#ifndef T_TXT
#define T_TXT 16
#endif #endif
/* /*

7
postfix/global/Makefile.in
View File

@ -396,6 +396,7 @@ mail_addr_find.o: ../include/msg.h
mail_addr_find.o: ../include/dict.h mail_addr_find.o: ../include/dict.h
mail_addr_find.o: ../include/vstream.h mail_addr_find.o: ../include/vstream.h
mail_addr_find.o: ../include/vbuf.h mail_addr_find.o: ../include/vbuf.h
mail_addr_find.o: ../include/argv.h
mail_addr_find.o: ../include/stringops.h mail_addr_find.o: ../include/stringops.h
mail_addr_find.o: ../include/mymalloc.h mail_addr_find.o: ../include/mymalloc.h
mail_addr_find.o: ../include/vstring.h mail_addr_find.o: ../include/vstring.h
@ -438,6 +439,7 @@ mail_conf.o: ../include/vstream.h
mail_conf.o: ../include/vbuf.h mail_conf.o: ../include/vbuf.h
mail_conf.o: ../include/vstring.h mail_conf.o: ../include/vstring.h
mail_conf.o: ../include/dict.h mail_conf.o: ../include/dict.h
mail_conf.o: ../include/argv.h
mail_conf.o: ../include/safe.h mail_conf.o: ../include/safe.h
mail_conf.o: ../include/stringops.h mail_conf.o: ../include/stringops.h
mail_conf.o: mail_params.h mail_conf.o: mail_params.h
@ -448,6 +450,7 @@ mail_conf_bool.o: ../include/msg.h
mail_conf_bool.o: ../include/dict.h mail_conf_bool.o: ../include/dict.h
mail_conf_bool.o: ../include/vstream.h mail_conf_bool.o: ../include/vstream.h
mail_conf_bool.o: ../include/vbuf.h mail_conf_bool.o: ../include/vbuf.h
mail_conf_bool.o: ../include/argv.h
mail_conf_bool.o: mail_conf.h mail_conf_bool.o: mail_conf.h
mail_conf_int.o: mail_conf_int.c mail_conf_int.o: mail_conf_int.c
mail_conf_int.o: ../include/sys_defs.h mail_conf_int.o: ../include/sys_defs.h
@ -456,6 +459,7 @@ mail_conf_int.o: ../include/mymalloc.h
mail_conf_int.o: ../include/dict.h mail_conf_int.o: ../include/dict.h
mail_conf_int.o: ../include/vstream.h mail_conf_int.o: ../include/vstream.h
mail_conf_int.o: ../include/vbuf.h mail_conf_int.o: ../include/vbuf.h
mail_conf_int.o: ../include/argv.h
mail_conf_int.o: ../include/stringops.h mail_conf_int.o: ../include/stringops.h
mail_conf_int.o: mail_conf.h mail_conf_int.o: mail_conf.h
mail_conf_raw.o: mail_conf_raw.c mail_conf_raw.o: mail_conf_raw.c
@ -638,6 +642,7 @@ mkmap_db.o: ../include/stringops.h
mkmap_db.o: ../include/dict.h mkmap_db.o: ../include/dict.h
mkmap_db.o: ../include/vstream.h mkmap_db.o: ../include/vstream.h
mkmap_db.o: ../include/vbuf.h mkmap_db.o: ../include/vbuf.h
mkmap_db.o: ../include/argv.h
mkmap_db.o: ../include/dict_db.h mkmap_db.o: ../include/dict_db.h
mkmap_db.o: mkmap.h mkmap_db.o: mkmap.h
mkmap_dbm.o: mkmap_dbm.c mkmap_dbm.o: mkmap_dbm.c
@ -648,6 +653,7 @@ mkmap_dbm.o: ../include/stringops.h
mkmap_dbm.o: ../include/dict.h mkmap_dbm.o: ../include/dict.h
mkmap_dbm.o: ../include/vstream.h mkmap_dbm.o: ../include/vstream.h
mkmap_dbm.o: ../include/vbuf.h mkmap_dbm.o: ../include/vbuf.h
mkmap_dbm.o: ../include/argv.h
mkmap_dbm.o: ../include/dict_dbm.h mkmap_dbm.o: ../include/dict_dbm.h
mkmap_dbm.o: mkmap.h mkmap_dbm.o: mkmap.h
mkmap_open.o: mkmap_open.c mkmap_open.o: mkmap_open.c
@ -656,6 +662,7 @@ mkmap_open.o: ../include/msg.h
mkmap_open.o: ../include/dict.h mkmap_open.o: ../include/dict.h
mkmap_open.o: ../include/vstream.h mkmap_open.o: ../include/vstream.h
mkmap_open.o: ../include/vbuf.h mkmap_open.o: ../include/vbuf.h
mkmap_open.o: ../include/argv.h
mkmap_open.o: ../include/sigdelay.h mkmap_open.o: ../include/sigdelay.h
mkmap_open.o: ../include/mymalloc.h mkmap_open.o: ../include/mymalloc.h
mkmap_open.o: ../include/myflock.h mkmap_open.o: ../include/myflock.h

6
postfix/global/local_transport.c
View File

@ -12,8 +12,8 @@
/* const char *transport; /* const char *transport;
/* DESCRIPTION /* DESCRIPTION
/* This module uses the information kept in the "local_transports" /* This module uses the information kept in the "local_transports"
/* configuration parameter, which lists the names of the default /* configuration parameter, which lists the name of the default
/* local transport followed by zero or more other transports that /* local transport, followed by zero or more other transports that
/* deliver locally. /* deliver locally.
/* /*
/* def_local_transport() returns the name of the default local /* def_local_transport() returns the name of the default local
@ -90,7 +90,7 @@ const char *def_local_transport(void)
/* /*
* Initialize on the fly. * Initialize on the fly.
*/ */
if (local_transport_list == 0) if (local_transport_name == 0)
local_transport_init(); local_transport_init();
/* /*

2
postfix/global/mail_version.h
View File

@ -15,7 +15,7 @@
* Version of this program. * Version of this program.
*/ */
#define VAR_MAIL_VERSION "mail_version" #define VAR_MAIL_VERSION "mail_version"
#define DEF_MAIL_VERSION "Snapshot-19991116" #define DEF_MAIL_VERSION "Snapshot-19991117"
extern char *var_mail_version; extern char *var_mail_version;
/* LICENSE /* LICENSE

2
postfix/local/Makefile.in
View File

@ -264,6 +264,7 @@ local.o: ../include/iostuff.h
local.o: ../include/name_mask.h local.o: ../include/name_mask.h
local.o: ../include/set_eugid.h local.o: ../include/set_eugid.h
local.o: ../include/dict.h local.o: ../include/dict.h
local.o: ../include/argv.h
local.o: ../include/recipient_list.h local.o: ../include/recipient_list.h
local.o: ../include/deliver_request.h local.o: ../include/deliver_request.h
local.o: ../include/deliver_completed.h local.o: ../include/deliver_completed.h
@ -351,6 +352,7 @@ recipient.o: ../include/stringops.h
recipient.o: ../include/dict.h recipient.o: ../include/dict.h
recipient.o: ../include/vstream.h recipient.o: ../include/vstream.h
recipient.o: ../include/vbuf.h recipient.o: ../include/vbuf.h
recipient.o: ../include/argv.h
recipient.o: ../include/bounce.h recipient.o: ../include/bounce.h
recipient.o: ../include/mail_params.h recipient.o: ../include/mail_params.h
recipient.o: ../include/split_addr.h recipient.o: ../include/split_addr.h

1
postfix/postalias/Makefile.in
View File

@ -71,3 +71,4 @@ postalias.o: ../include/mail_conf.h
postalias.o: ../include/mail_params.h postalias.o: ../include/mail_params.h
postalias.o: ../include/mkmap.h postalias.o: ../include/mkmap.h
postalias.o: ../include/dict.h postalias.o: ../include/dict.h
postalias.o: ../include/argv.h

6
postfix/postconf/Makefile.in
View File

@ -74,9 +74,13 @@ postconf.o: ../include/get_hostname.h
postconf.o: ../include/stringops.h postconf.o: ../include/stringops.h
postconf.o: ../include/htable.h postconf.o: ../include/htable.h
postconf.o: ../include/dict.h postconf.o: ../include/dict.h
postconf.o: ../include/argv.h
postconf.o: ../include/safe.h postconf.o: ../include/safe.h
postconf.o: ../include/mymalloc.h postconf.o: ../include/mymalloc.h
postconf.o: ../include/line_wrap.h postconf.o: ../include/split_at.h
postconf.o: ../include/readlline.h
postconf.o: ../include/vstring.h
postconf.o: ../include/myflock.h
postconf.o: ../include/mynetworks.h postconf.o: ../include/mynetworks.h
postconf.o: ../include/mail_conf.h postconf.o: ../include/mail_conf.h
postconf.o: ../include/mail_proto.h postconf.o: ../include/mail_proto.h

12
postfix/postconf/postconf.c
View File

@ -187,10 +187,12 @@ static const char *check_myhostname(void)
*/ */
name = get_hostname(); name = get_hostname();
if ((mode & SHOW_DEFS) == 0 && (dot = strchr(name, '.')) == 0) { if ((mode & SHOW_DEFS) == 0 && (dot = strchr(name, '.')) == 0) {
if ((domain = mail_conf_lookup_eval(VAR_MYDOMAIN)) == 0) if ((domain = mail_conf_lookup_eval(VAR_MYDOMAIN)) == 0) {
msg_fatal("My hostname %s is not a fully qualified name - set %s or %s in %s/main.cf", msg_warn("My hostname %s is not a fully qualified name - set %s or %s in %s/main.cf",
name, VAR_MYHOSTNAME, VAR_MYDOMAIN, var_config_dir); name, VAR_MYHOSTNAME, VAR_MYDOMAIN, var_config_dir);
name = concatenate(name, ".", domain, (char *) 0); } else {
name = concatenate(name, ".", domain, (char *) 0);
}
} }
return (name); return (name);
} }
@ -263,6 +265,8 @@ static void edit_parameters(int argc, char **argv)
if ((value = split_at(cp, '=')) == 0 if ((value = split_at(cp, '=')) == 0
|| *(cp += strspn(cp, " \t\r\n")) == 0) || *(cp += strspn(cp, " \t\r\n")) == 0)
msg_fatal("edit requires \"key = value\" arguments"); msg_fatal("edit requires \"key = value\" arguments");
while (*value && ISSPACE(*value))
value++;
cvalue = (struct cvalue *) mymalloc(sizeof(*cvalue)); cvalue = (struct cvalue *) mymalloc(sizeof(*cvalue));
cvalue->value = value; cvalue->value = value;
cvalue->found = 0; cvalue->found = 0;

1
postfix/postmap/Makefile.in
View File

@ -68,3 +68,4 @@ postmap.o: ../include/mail_conf.h
postmap.o: ../include/mail_params.h postmap.o: ../include/mail_params.h
postmap.o: ../include/mkmap.h postmap.o: ../include/mkmap.h
postmap.o: ../include/dict.h postmap.o: ../include/dict.h
postmap.o: ../include/argv.h

13
postfix/qmgr/Makefile.in
View File

@ -65,6 +65,7 @@ qmgr.o: ../include/events.h
qmgr.o: ../include/vstream.h qmgr.o: ../include/vstream.h
qmgr.o: ../include/vbuf.h qmgr.o: ../include/vbuf.h
qmgr.o: ../include/dict.h qmgr.o: ../include/dict.h
qmgr.o: ../include/argv.h
qmgr.o: ../include/mail_queue.h qmgr.o: ../include/mail_queue.h
qmgr.o: ../include/vstring.h qmgr.o: ../include/vstring.h
qmgr.o: ../include/recipient_list.h qmgr.o: ../include/recipient_list.h
@ -96,6 +97,7 @@ qmgr_active.o: qmgr.h
qmgr_active.o: ../include/scan_dir.h qmgr_active.o: ../include/scan_dir.h
qmgr_active.o: ../include/maps.h qmgr_active.o: ../include/maps.h
qmgr_active.o: ../include/dict.h qmgr_active.o: ../include/dict.h
qmgr_active.o: ../include/argv.h
qmgr_bounce.o: qmgr_bounce.c qmgr_bounce.o: qmgr_bounce.c
qmgr_bounce.o: ../include/sys_defs.h qmgr_bounce.o: ../include/sys_defs.h
qmgr_bounce.o: ../include/bounce.h qmgr_bounce.o: ../include/bounce.h
@ -106,6 +108,7 @@ qmgr_bounce.o: qmgr.h
qmgr_bounce.o: ../include/scan_dir.h qmgr_bounce.o: ../include/scan_dir.h
qmgr_bounce.o: ../include/maps.h qmgr_bounce.o: ../include/maps.h
qmgr_bounce.o: ../include/dict.h qmgr_bounce.o: ../include/dict.h
qmgr_bounce.o: ../include/argv.h
qmgr_defer.o: qmgr_defer.c qmgr_defer.o: qmgr_defer.c
qmgr_defer.o: ../include/sys_defs.h qmgr_defer.o: ../include/sys_defs.h
qmgr_defer.o: ../include/msg.h qmgr_defer.o: ../include/msg.h
@ -117,6 +120,7 @@ qmgr_defer.o: qmgr.h
qmgr_defer.o: ../include/scan_dir.h qmgr_defer.o: ../include/scan_dir.h
qmgr_defer.o: ../include/maps.h qmgr_defer.o: ../include/maps.h
qmgr_defer.o: ../include/dict.h qmgr_defer.o: ../include/dict.h
qmgr_defer.o: ../include/argv.h
qmgr_deliver.o: qmgr_deliver.c qmgr_deliver.o: qmgr_deliver.c
qmgr_deliver.o: ../include/sys_defs.h qmgr_deliver.o: ../include/sys_defs.h
qmgr_deliver.o: ../include/msg.h qmgr_deliver.o: ../include/msg.h
@ -134,6 +138,7 @@ qmgr_deliver.o: qmgr.h
qmgr_deliver.o: ../include/scan_dir.h qmgr_deliver.o: ../include/scan_dir.h
qmgr_deliver.o: ../include/maps.h qmgr_deliver.o: ../include/maps.h
qmgr_deliver.o: ../include/dict.h qmgr_deliver.o: ../include/dict.h
qmgr_deliver.o: ../include/argv.h
qmgr_enable.o: qmgr_enable.c qmgr_enable.o: qmgr_enable.c
qmgr_enable.o: ../include/sys_defs.h qmgr_enable.o: ../include/sys_defs.h
qmgr_enable.o: ../include/msg.h qmgr_enable.o: ../include/msg.h
@ -143,6 +148,7 @@ qmgr_enable.o: qmgr.h
qmgr_enable.o: ../include/scan_dir.h qmgr_enable.o: ../include/scan_dir.h
qmgr_enable.o: ../include/maps.h qmgr_enable.o: ../include/maps.h
qmgr_enable.o: ../include/dict.h qmgr_enable.o: ../include/dict.h
qmgr_enable.o: ../include/argv.h
qmgr_entry.o: qmgr_entry.c qmgr_entry.o: qmgr_entry.c
qmgr_entry.o: ../include/sys_defs.h qmgr_entry.o: ../include/sys_defs.h
qmgr_entry.o: ../include/msg.h qmgr_entry.o: ../include/msg.h
@ -155,6 +161,7 @@ qmgr_entry.o: qmgr.h
qmgr_entry.o: ../include/scan_dir.h qmgr_entry.o: ../include/scan_dir.h
qmgr_entry.o: ../include/maps.h qmgr_entry.o: ../include/maps.h
qmgr_entry.o: ../include/dict.h qmgr_entry.o: ../include/dict.h
qmgr_entry.o: ../include/argv.h
qmgr_message.o: qmgr_message.c qmgr_message.o: qmgr_message.c
qmgr_message.o: ../include/sys_defs.h qmgr_message.o: ../include/sys_defs.h
qmgr_message.o: ../include/msg.h qmgr_message.o: ../include/msg.h
@ -178,6 +185,7 @@ qmgr_message.o: ../include/deliver_completed.h
qmgr_message.o: ../include/mail_addr_find.h qmgr_message.o: ../include/mail_addr_find.h
qmgr_message.o: ../include/maps.h qmgr_message.o: ../include/maps.h
qmgr_message.o: ../include/opened.h qmgr_message.o: ../include/opened.h
qmgr_message.o: ../include/local_transport.h
qmgr_message.o: ../include/resolve_clnt.h qmgr_message.o: ../include/resolve_clnt.h
qmgr_message.o: qmgr.h qmgr_message.o: qmgr.h
qmgr_message.o: ../include/scan_dir.h qmgr_message.o: ../include/scan_dir.h
@ -194,6 +202,7 @@ qmgr_move.o: ../include/mail_scan_dir.h
qmgr_move.o: qmgr.h qmgr_move.o: qmgr.h
qmgr_move.o: ../include/maps.h qmgr_move.o: ../include/maps.h
qmgr_move.o: ../include/dict.h qmgr_move.o: ../include/dict.h
qmgr_move.o: ../include/argv.h
qmgr_queue.o: qmgr_queue.c qmgr_queue.o: qmgr_queue.c
qmgr_queue.o: ../include/sys_defs.h qmgr_queue.o: ../include/sys_defs.h
qmgr_queue.o: ../include/msg.h qmgr_queue.o: ../include/msg.h
@ -208,6 +217,7 @@ qmgr_queue.o: ../include/vbuf.h
qmgr_queue.o: ../include/scan_dir.h qmgr_queue.o: ../include/scan_dir.h
qmgr_queue.o: ../include/maps.h qmgr_queue.o: ../include/maps.h
qmgr_queue.o: ../include/dict.h qmgr_queue.o: ../include/dict.h
qmgr_queue.o: ../include/argv.h
qmgr_rcpt_list.o: qmgr_rcpt_list.c qmgr_rcpt_list.o: qmgr_rcpt_list.c
qmgr_rcpt_list.o: ../include/sys_defs.h qmgr_rcpt_list.o: ../include/sys_defs.h
qmgr_rcpt_list.o: ../include/mymalloc.h qmgr_rcpt_list.o: ../include/mymalloc.h
@ -217,6 +227,7 @@ qmgr_rcpt_list.o: ../include/vbuf.h
qmgr_rcpt_list.o: ../include/scan_dir.h qmgr_rcpt_list.o: ../include/scan_dir.h
qmgr_rcpt_list.o: ../include/maps.h qmgr_rcpt_list.o: ../include/maps.h
qmgr_rcpt_list.o: ../include/dict.h qmgr_rcpt_list.o: ../include/dict.h
qmgr_rcpt_list.o: ../include/argv.h
qmgr_scan.o: qmgr_scan.c qmgr_scan.o: qmgr_scan.c
qmgr_scan.o: ../include/sys_defs.h qmgr_scan.o: ../include/sys_defs.h
qmgr_scan.o: ../include/msg.h qmgr_scan.o: ../include/msg.h
@ -228,6 +239,7 @@ qmgr_scan.o: ../include/vstream.h
qmgr_scan.o: ../include/vbuf.h qmgr_scan.o: ../include/vbuf.h
qmgr_scan.o: ../include/maps.h qmgr_scan.o: ../include/maps.h
qmgr_scan.o: ../include/dict.h qmgr_scan.o: ../include/dict.h
qmgr_scan.o: ../include/argv.h
qmgr_transport.o: qmgr_transport.c qmgr_transport.o: qmgr_transport.c
qmgr_transport.o: ../include/sys_defs.h qmgr_transport.o: ../include/sys_defs.h
qmgr_transport.o: ../include/msg.h qmgr_transport.o: ../include/msg.h
@ -245,3 +257,4 @@ qmgr_transport.o: qmgr.h
qmgr_transport.o: ../include/scan_dir.h qmgr_transport.o: ../include/scan_dir.h
qmgr_transport.o: ../include/maps.h qmgr_transport.o: ../include/maps.h
qmgr_transport.o: ../include/dict.h qmgr_transport.o: ../include/dict.h
qmgr_transport.o: ../include/argv.h

1
postfix/qmgr/qmgr.c
View File

@ -474,6 +474,7 @@ int main(int argc, char **argv)
trigger_server_main(argc, argv, qmgr_trigger_event, trigger_server_main(argc, argv, qmgr_trigger_event,
MAIL_SERVER_INT_TABLE, int_table, MAIL_SERVER_INT_TABLE, int_table,
MAIL_SERVER_STR_TABLE, str_table, MAIL_SERVER_STR_TABLE, str_table,
MAIL_SERVER_BOOL_TABLE, bool_table,
MAIL_SERVER_PRE_INIT, qmgr_pre_init, MAIL_SERVER_PRE_INIT, qmgr_pre_init,
MAIL_SERVER_POST_INIT, qmgr_post_init, MAIL_SERVER_POST_INIT, qmgr_post_init,
MAIL_SERVER_LOOP, qmgr_loop, MAIL_SERVER_LOOP, qmgr_loop,

2
postfix/smtp/Makefile.in
View File

@ -72,6 +72,7 @@ smtp.o: ../include/sys_defs.h
smtp.o: ../include/dict.h smtp.o: ../include/dict.h
smtp.o: ../include/vstream.h smtp.o: ../include/vstream.h
smtp.o: ../include/vbuf.h smtp.o: ../include/vbuf.h
smtp.o: ../include/argv.h
smtp.o: ../include/msg.h smtp.o: ../include/msg.h
smtp.o: ../include/mymalloc.h smtp.o: ../include/mymalloc.h
smtp.o: ../include/name_mask.h smtp.o: ../include/name_mask.h
@ -87,7 +88,6 @@ smtp.o: ../include/mail_proto.h
smtp.o: ../include/iostuff.h smtp.o: ../include/iostuff.h
smtp.o: ../include/mail_server.h smtp.o: ../include/mail_server.h
smtp.o: smtp.h smtp.o: smtp.h
smtp.o: ../include/argv.h
smtp_addr.o: smtp_addr.c smtp_addr.o: smtp_addr.c
smtp_addr.o: ../include/sys_defs.h smtp_addr.o: ../include/sys_defs.h
smtp_addr.o: ../include/msg.h smtp_addr.o: ../include/msg.h

24
postfix/smtpd/Makefile.in
View File

@ -1,6 +1,8 @@
SHELL = /bin/sh SHELL = /bin/sh
SRCS = smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c SRCS = smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \
OBJS = smtpd.o smtpd_token.o smtpd_check.o smtpd_chat.o smtpd_state.o smtpd_peer.c
OBJS = smtpd.o smtpd_token.o smtpd_check.o smtpd_chat.o smtpd_state.o \
smtpd_peer.o
HDRS = smtpd_token.h smtpd_check.h smtpd_chat.h HDRS = smtpd_token.h smtpd_check.h smtpd_chat.h
TESTSRC = smtpd_token_test.c TESTSRC = smtpd_token_test.c
WARN = -W -Wformat -Wimplicit -Wmissing-prototypes \ WARN = -W -Wformat -Wimplicit -Wmissing-prototypes \
@ -28,7 +30,7 @@ update: ../libexec/$(PROG)
../libexec/$(PROG): $(PROG) ../libexec/$(PROG): $(PROG)
cp $(PROG) ../libexec cp $(PROG) ../libexec
SMTPD_CHECK_OBJ = smtpd_state.o SMTPD_CHECK_OBJ = smtpd_state.o smtpd_peer.o
smtpd_token: smtpd_token.c $(LIBS) smtpd_token: smtpd_token.c $(LIBS)
$(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIBS) $(SYSLIBS) $(CC) $(CFLAGS) -DTEST -o $@ $@.c $(LIBS) $(SYSLIBS)
@ -97,7 +99,7 @@ smtpd.o: ../include/events.h
smtpd.o: ../include/smtp_stream.h smtpd.o: ../include/smtp_stream.h
smtpd.o: ../include/valid_hostname.h smtpd.o: ../include/valid_hostname.h
smtpd.o: ../include/dict.h smtpd.o: ../include/dict.h
smtpd.o: ../include/peer_name.h smtpd.o: ../include/argv.h
smtpd.o: ../include/mail_params.h smtpd.o: ../include/mail_params.h
smtpd.o: ../include/record.h smtpd.o: ../include/record.h
smtpd.o: ../include/rec_type.h smtpd.o: ../include/rec_type.h
@ -118,7 +120,6 @@ smtpd.o: ../include/resolve_clnt.h
smtpd.o: ../include/mail_server.h smtpd.o: ../include/mail_server.h
smtpd.o: smtpd_token.h smtpd.o: smtpd_token.h
smtpd.o: smtpd.h smtpd.o: smtpd.h
smtpd.o: ../include/argv.h
smtpd.o: smtpd_check.h smtpd.o: smtpd_check.h
smtpd.o: smtpd_chat.h smtpd.o: smtpd_chat.h
smtpd_chat.o: smtpd_chat.c smtpd_chat.o: smtpd_chat.c
@ -176,6 +177,18 @@ smtpd_check.o: ../include/local_transport.h
smtpd_check.o: smtpd.h smtpd_check.o: smtpd.h
smtpd_check.o: ../include/mail_stream.h smtpd_check.o: ../include/mail_stream.h
smtpd_check.o: smtpd_check.h smtpd_check.o: smtpd_check.h
smtpd_peer.o: smtpd_peer.c
smtpd_peer.o: ../include/sys_defs.h
smtpd_peer.o: ../include/msg.h
smtpd_peer.o: ../include/mymalloc.h
smtpd_peer.o: ../include/valid_hostname.h
smtpd_peer.o: ../include/stringops.h
smtpd_peer.o: smtpd.h
smtpd_peer.o: ../include/vstream.h
smtpd_peer.o: ../include/vbuf.h
smtpd_peer.o: ../include/vstring.h
smtpd_peer.o: ../include/argv.h
smtpd_peer.o: ../include/mail_stream.h
smtpd_state.o: smtpd_state.c smtpd_state.o: smtpd_state.c
smtpd_state.o: ../include/sys_defs.h smtpd_state.o: ../include/sys_defs.h
smtpd_state.o: ../include/events.h smtpd_state.o: ../include/events.h
@ -183,7 +196,6 @@ smtpd_state.o: ../include/mymalloc.h
smtpd_state.o: ../include/vstream.h smtpd_state.o: ../include/vstream.h
smtpd_state.o: ../include/vbuf.h smtpd_state.o: ../include/vbuf.h
smtpd_state.o: ../include/name_mask.h smtpd_state.o: ../include/name_mask.h
smtpd_state.o: ../include/stringops.h
smtpd_state.o: ../include/cleanup_user.h smtpd_state.o: ../include/cleanup_user.h
smtpd_state.o: ../include/mail_params.h smtpd_state.o: ../include/mail_params.h
smtpd_state.o: ../include/mail_error.h smtpd_state.o: ../include/mail_error.h

5
postfix/smtpd/smtpd.c
View File

@ -224,7 +224,6 @@
/* Global library. */ /* Global library. */
#include <peer_name.h>
#include <mail_params.h> #include <mail_params.h>
#include <record.h> #include <record.h>
#include <rec_type.h> #include <rec_type.h>
@ -1167,7 +1166,6 @@ static void smtpd_proto(SMTPD_STATE *state)
static void smtpd_service(VSTREAM *stream, char *unused_service, char **argv) static void smtpd_service(VSTREAM *stream, char *unused_service, char **argv)
{ {
SMTPD_STATE state; SMTPD_STATE state;
PEER_NAME *peer;
/* /*
* Sanity check. This service takes no command-line arguments. * Sanity check. This service takes no command-line arguments.
@ -1184,8 +1182,7 @@ static void smtpd_service(VSTREAM *stream, char *unused_service, char **argv)
* take a while. This is why I always run a local name server on critical * take a while. This is why I always run a local name server on critical
* machines. * machines.
*/ */
peer = peer_name(vstream_fileno(stream)); smtpd_state_init(&state, stream);
smtpd_state_init(&state, stream, peer->name, peer->addr);
/* /*
* See if we need to turn on verbose logging for this client. * See if we need to turn on verbose logging for this client.

10
postfix/smtpd/smtpd.h
View File

@ -34,6 +34,7 @@ typedef struct SMTPD_STATE {
char *name; char *name;
char *addr; char *addr;
char *namaddr; char *namaddr;
int peer_code; /* 2=ok, 4=soft, 5=hard */
int error_count; int error_count;
int error_mask; int error_mask;
int notify_mask; int notify_mask;
@ -52,8 +53,7 @@ typedef struct SMTPD_STATE {
char *where; char *where;
} SMTPD_STATE; } SMTPD_STATE;
extern void smtpd_state_init(SMTPD_STATE *, VSTREAM *, extern void smtpd_state_init(SMTPD_STATE *, VSTREAM *);
const char *, const char *);
extern void smtpd_state_reset(SMTPD_STATE *); extern void smtpd_state_reset(SMTPD_STATE *);
/* /*
@ -70,6 +70,12 @@ extern void smtpd_state_reset(SMTPD_STATE *);
#define SMTPD_STAND_ALONE(state) \ #define SMTPD_STAND_ALONE(state) \
(state->client == VSTREAM_IN && getuid() != var_owner_uid) (state->client == VSTREAM_IN && getuid() != var_owner_uid)
/*
* SMPTD peer information lookup.
*/
void smtpd_peer_init(SMTPD_STATE *state);
void smtpd_peer_reset(SMTPD_STATE *state);
/* LICENSE /* LICENSE
/* .ad /* .ad
/* .fi /* .fi

19
postfix/smtpd/smtpd_check.c
View File

@ -496,7 +496,9 @@ static int reject_unknown_client(SMTPD_STATE *state)
if (strcasecmp(state->name, "unknown") == 0) if (strcasecmp(state->name, "unknown") == 0)
return (smtpd_check_reject(state, MAIL_ERROR_POLICY, return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
"%d Client host rejected: cannot find your hostname, [%s]", "%d Client host rejected: cannot find your hostname, [%s]",
var_unk_client_code, state->addr)); state->peer_code == 5 ?
var_unk_client_code : 450,
state->addr));
return (SMTPD_CHECK_DUNNO); return (SMTPD_CHECK_DUNNO);
} }
@ -734,7 +736,7 @@ static int check_relay_domains(SMTPD_STATE *state, char *recipient,
/* permit_auth_destination - OK for message relaying */ /* permit_auth_destination - OK for message relaying */
static int permit_auth_destination(SMTPD_STATE *state, char *recipient) static int permit_auth_destination(char *recipient)
{ {
char *myname = "permit_auth_destination"; char *myname = "permit_auth_destination";
char *domain; char *domain;
@ -1606,7 +1608,7 @@ static int generic_checks(SMTPD_STATE *state, ARGV *restrictions,
status = permit_mx_backup(state, state->recipient); status = permit_mx_backup(state, state->recipient);
} else if (strcasecmp(name, PERMIT_AUTH_DEST) == 0) { } else if (strcasecmp(name, PERMIT_AUTH_DEST) == 0) {
if (state->recipient) if (state->recipient)
status = permit_auth_destination(state, state->recipient); status = permit_auth_destination(state->recipient);
} else if (strcasecmp(name, REJECT_UNAUTH_DEST) == 0) { } else if (strcasecmp(name, REJECT_UNAUTH_DEST) == 0) {
if (state->recipient) if (state->recipient)
status = reject_unauth_destination(state, state->recipient); status = reject_unauth_destination(state, state->recipient);
@ -1931,6 +1933,7 @@ char *var_maps_rbl_domains;
char *var_mydest; char *var_mydest;
char *var_inet_interfaces; char *var_inet_interfaces;
char *var_rest_classes; char *var_rest_classes;
char *var_local_transports;
typedef struct { typedef struct {
char *name; char *name;
@ -1943,6 +1946,7 @@ static STRING_TABLE string_table[] = {
VAR_MYDEST, DEF_MYDEST, &var_mydest, VAR_MYDEST, DEF_MYDEST, &var_mydest,
VAR_INET_INTERFACES, DEF_INET_INTERFACES, &var_inet_interfaces, VAR_INET_INTERFACES, DEF_INET_INTERFACES, &var_inet_interfaces,
VAR_REST_CLASSES, DEF_REST_CLASSES, &var_rest_classes, VAR_REST_CLASSES, DEF_REST_CLASSES, &var_rest_classes,
VAR_LOCAL_TRANSP, DEF_LOCAL_TRANSP, &var_local_transports,
0, 0,
}; };
@ -2131,7 +2135,7 @@ main(int argc, char **argv)
string_init(); string_init();
int_init(); int_init();
smtpd_check_init(); smtpd_check_init();
smtpd_state_init(&state, VSTREAM_IN, "", ""); smtpd_state_init(&state, VSTREAM_IN);
state.queue_id = "<queue id>"; state.queue_id = "<queue id>";
/* /*
@ -2166,6 +2170,7 @@ main(int argc, char **argv)
/* /*
* Special case: client identity. * Special case: client identity.
*/ */
case 4:
case 3: case 3:
#define UPDATE_STRING(ptr,val) { if (ptr) myfree(ptr); ptr = mystrdup(val); } #define UPDATE_STRING(ptr,val) { if (ptr) myfree(ptr); ptr = mystrdup(val); }
@ -2173,6 +2178,10 @@ main(int argc, char **argv)
state.where = "CONNECT"; state.where = "CONNECT";
UPDATE_STRING(state.name, args->argv[1]); UPDATE_STRING(state.name, args->argv[1]);
UPDATE_STRING(state.addr, args->argv[2]); UPDATE_STRING(state.addr, args->argv[2]);
if (args->argc == 4)
state.peer_code = atoi(args->argv[3]);
else
state.peer_code = 2;
if (state.namaddr) if (state.namaddr)
myfree(state.namaddr); myfree(state.namaddr);
state.namaddr = concatenate(state.name, "[", state.addr, state.namaddr = concatenate(state.name, "[", state.addr,
@ -2226,7 +2235,7 @@ main(int argc, char **argv)
*/ */
default: default:
resp = "Commands...\n\ resp = "Commands...\n\
client <name> <address>\n\ client <name> <address> [<code>]\n\
helo <hostname>\n\ helo <hostname>\n\
sender <address>\n\ sender <address>\n\
recipient <address>\n\ recipient <address>\n\

8
postfix/smtpd/smtpd_check.in2
View File

@ -105,3 +105,11 @@ rcpt user@foo.com
recipient_restrictions reject_unauth_destination,permit recipient_restrictions reject_unauth_destination,permit
rcpt user@foo.org rcpt user@foo.org
rcpt user@foo.com rcpt user@foo.com
#
# unknown client tests
#
unknown_client_reject_code 550
client_restrictions reject_unknown_client
client spike.porcupine.org 160.100.189.2 2
client unknown 1.1.1.1 4
client unknown 1.1.1.1 5

15
postfix/smtpd/smtpd_check.ref2
View File

@ -214,3 +214,18 @@ OK
554 <user@foo.org>: Relay access denied 554 <user@foo.org>: Relay access denied
>>> rcpt user@foo.com >>> rcpt user@foo.com
OK OK
>>> #
>>> # unknown client tests
>>> #
>>> unknown_client_reject_code 550
OK
>>> client_restrictions reject_unknown_client
OK
>>> client spike.porcupine.org 160.100.189.2 2
OK
>>> client unknown 1.1.1.1 4
./smtpd_check: reject: CONNECT from unknown[1.1.1.1]: 450 Client host rejected: cannot find your hostname, [1.1.1.1]; from=<user@some.where>
450 Client host rejected: cannot find your hostname, [1.1.1.1]
>>> client unknown 1.1.1.1 5
./smtpd_check: reject: CONNECT from unknown[1.1.1.1]: 550 Client host rejected: cannot find your hostname, [1.1.1.1]; from=<user@some.where>
550 Client host rejected: cannot find your hostname, [1.1.1.1]

182
postfix/smtpd/smtpd_peer.c Normal file
View File

@ -0,0 +1,182 @@
/*++
/* NAME
/* smtpd_peer 3
/* SUMMARY
/* look up peer name/address information
/* SYNOPSIS
/* #include "smtpd.h"
/*
/* void smtpd_peer_init(state)
/* SMTPD_STATE *state;
/*
/* void smtpd_peer_reset(state)
/* SMTPD_STATE *state;
/* DESCRIPTION
/* The smtpd_peer_init() routine attempts to produce a printable
/* version of the peer name and address of the specified socket.
/* Where information is unavailable, the name and/or address
/* are set to "unknown".
/*
/* smtpd_peer_init() updates the following fields:
/* .IP name
/* The client hostname. An unknown name is represented by the
/* string "unknown".
/* .IP addr
/* Printable representation of the client address.
/* .IP namaddr
/* String of the form: "name[addr]".
/* .IP peer_code
/* The peer_code result field specifies how the client name
/* information should be interpreted:
/* .RS
/* .IP 2
/* Both name lookup and name verification succeeded.
/* .IP 4
/* The name lookup or name verification failed with a recoverable
/* error (no address->name mapping or no name->address mapping).
/* .IP 5
/* The name lookup or verification failed with an unrecoverable
/* error (no address->name mapping, bad hostname syntax, no
/* name->address mapping, client address not listed for hostname).
/* .RE
/* .PP
/* smtpd_peer_reset() releases memory allocate by smtpd_peer_init().
/* LICENSE
/* .ad
/* .fi
/* The Secure Mailer license must be distributed with this software.
/* AUTHOR(S)
/* Wietse Venema
/* IBM T.J. Watson Research
/* P.O. Box 704
/* Yorktown Heights, NY 10598, USA
/*--*/
/* System library. */
#include <sys_defs.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <string.h>
#ifdef NO_HERRNO
static int h_errno = TRY_AGAIN;
define hstrerror(x) "Host not found"
#endif
/* Utility library. */
#include <msg.h>
#include <mymalloc.h>
#include <valid_hostname.h>
#include <stringops.h>
/* Global library. */
/* Application-specific. */
#include "smtpd.h"
/* smtpd_peer_init - initialize peer information */
void smtpd_peer_init(SMTPD_STATE *state)
{
struct sockaddr_in sin;
SOCKADDR_SIZE len = sizeof(sin);
struct hostent *hp;
int i;
/*
* If it's not networked assume local.
*/
if (getpeername(vstream_fileno(state->client),
(struct sockaddr *) & sin, &len) < 0)
sin.sin_family = AF_UNSPEC;
switch (sin.sin_family) {
/*
* If it's not Internet, assume the client is local, and avoid using
* the naming service because that can hang when the machine is
* disconnected.
*/
default:
state->name = mystrdup("localhost");
state->addr = mystrdup("127.0.0.1"); /* XXX bogus. */
state->peer_code = 2;
break;
/*
* Look up and "verify" the client hostname.
*/
case AF_INET:
state->addr = mystrdup(inet_ntoa(sin.sin_addr));
hp = gethostbyaddr((char *) &(sin.sin_addr),
sizeof(sin.sin_addr), AF_INET);
if (hp == 0) {
state->name = mystrdup("unknown");
state->peer_code = (h_errno == TRY_AGAIN ? 4 : 5);
break;
}
if (!valid_hostname(hp->h_name)) {
state->name = mystrdup("unknown");
state->peer_code = 5;
break;
}
state->name = mystrdup(hp->h_name); /* hp->name is clobbered!! */
state->peer_code = 2;
/*
* Reject the hostname if it does not list the peer address.
*/
hp = gethostbyname(state->name); /* clobbers hp->name!! */
if (hp == 0) {
msg_warn("hostname %s verification failed: %s",
state->name, hstrerror(h_errno));
myfree(state->name);
state->name = mystrdup("unknown");
state->peer_code = (h_errno == TRY_AGAIN ? 4 : 5);
break;
}
if (hp->h_length != sizeof(sin.sin_addr)) {
msg_warn("hostname %s verification failed: bad address size %d",
state->name, hp->h_length);
myfree(state->name);
state->name = mystrdup("unknown");
state->peer_code = 5;
break;
}
for (i = 0; hp->h_addr_list[i]; i++) {
if (memcmp(hp->h_addr_list[i],
(char *) &sin.sin_addr,
sizeof(sin.sin_addr)) == 0)
break;
}
if (hp->h_addr_list[i] == 0) {
msg_warn("address %s not listed for name %s",
state->addr, state->name);
myfree(state->name);
state->name = mystrdup("unknown");
state->peer_code = 5;
break;
}
break;
}
state->namaddr =
concatenate(state->name, "[", state->addr, "]", (char *) 0);
}
/* smtpd_peer_reset - destroy peer information */
void smtpd_peer_reset(SMTPD_STATE *state)
{
if (state->name)
myfree(state->name);
if (state->addr)
myfree(state->addr);
if (state->namaddr)
myfree(state->namaddr);
}

29
postfix/smtpd/smtpd_state.c
View File

@ -6,11 +6,9 @@
/* SYNOPSIS /* SYNOPSIS
/* #include "smtpd.h" /* #include "smtpd.h"
/* /*
/* void smtpd_state_init(state, stream, name, addr) /* void smtpd_state_init(state, stream)
/* SMTPD_STATE *state; /* SMTPD_STATE *state;
/* VSTREAM *stream; /* VSTREAM *stream;
/* const char *name;
/* const char *addr;
/* /*
/* void smtpd_state_reset(state) /* void smtpd_state_reset(state)
/* SMTPD_STATE *state; /* SMTPD_STATE *state;
@ -24,12 +22,6 @@
/* Session context. /* Session context.
/* .IP stream /* .IP stream
/* Stream connected to peer. The stream is not copied. /* Stream connected to peer. The stream is not copied.
/* .IP name
/* Printable representation of the peer host name. The
/* name is copied.
/* .IP addr
/* Printable representation of the peer host address. The
/* address is copied.
/* DIAGNOSTICS /* DIAGNOSTICS
/* All errors are fatal. /* All errors are fatal.
/* LICENSE /* LICENSE
@ -53,7 +45,6 @@
#include <mymalloc.h> #include <mymalloc.h>
#include <vstream.h> #include <vstream.h>
#include <name_mask.h> #include <name_mask.h>
#include <stringops.h>
/* Global library. */ /* Global library. */
@ -68,8 +59,7 @@
/* smtpd_state_init - initialize after connection establishment */ /* smtpd_state_init - initialize after connection establishment */
void smtpd_state_init(SMTPD_STATE *state, VSTREAM *stream, void smtpd_state_init(SMTPD_STATE *state, VSTREAM *stream)
const char *name, const char *addr)
{ {
/* /*
@ -79,9 +69,6 @@ void smtpd_state_init(SMTPD_STATE *state, VSTREAM *stream,
state->err = CLEANUP_STAT_OK; state->err = CLEANUP_STAT_OK;
state->client = stream; state->client = stream;
state->buffer = vstring_alloc(100); state->buffer = vstring_alloc(100);
state->name = mystrdup(name);
state->addr = mystrdup(addr);
state->namaddr = concatenate(name, "[", addr, "]", (char *) 0);
state->error_count = 0; state->error_count = 0;
state->error_mask = 0; state->error_mask = 0;
state->notify_mask = name_mask(mail_error_masks, var_notify_classes); state->notify_mask = name_mask(mail_error_masks, var_notify_classes);
@ -99,6 +86,11 @@ void smtpd_state_init(SMTPD_STATE *state, VSTREAM *stream,
state->protocol = "SMTP"; state->protocol = "SMTP";
state->where = SMTPD_AFTER_CONNECT; state->where = SMTPD_AFTER_CONNECT;
/*
* Initialize peer information.
*/
smtpd_peer_init(state);
/* /*
* Initialize the conversation history. * Initialize the conversation history.
*/ */
@ -117,10 +109,5 @@ void smtpd_state_reset(SMTPD_STATE *state)
*/ */
if (state->buffer) if (state->buffer)
vstring_free(state->buffer); vstring_free(state->buffer);
if (state->name) smtpd_peer_reset(state);
myfree(state->name);
if (state->addr)
myfree(state->addr);
if (state->namaddr)
myfree(state->namaddr);
} }

2
postfix/smtpd/smtpd_token.c
View File

@ -8,6 +8,7 @@
/* /*
/* typedef struct { /* typedef struct {
/* .in +4 /* .in +4
/* int tokval;
/* char *strval; /* char *strval;
/* /* other stuff... */ /* /* other stuff... */
/* .in -4 /* .in -4
@ -139,6 +140,7 @@ static char *smtp_next_token(char *cp, SMTPD_TOKEN *arg)
break; break;
} else { /* other */ } else { /* other */
if (c == '\\') { if (c == '\\') {
VSTRING_ADDCH(arg->vstrval, c);
if ((c = *cp) == 0) if ((c = *cp) == 0)
break; break;
cp++; cp++;

2
postfix/smtpd/smtpd_token.ref
View File

@ -60,7 +60,7 @@ Token value: mail
Token type: other Token type: other
Token value: from: Token value: from:
Token type: other Token type: other
Token value: wietse venema@porcupine.org Token value: wietse\ venema@porcupine.org
mail to:<"wietse venema> mail to:<"wietse venema>
Token type: other Token type: other
Token value: mail Token value: mail

3
postfix/trivial-rewrite/Makefile.in
View File

@ -77,6 +77,7 @@ resolve.o: ../include/mail_conf.h
resolve.o: ../include/quote_822_local.h resolve.o: ../include/quote_822_local.h
resolve.o: ../include/tok822.h resolve.o: ../include/tok822.h
resolve.o: ../include/resolve_clnt.h resolve.o: ../include/resolve_clnt.h
resolve.o: ../include/local_transport.h
resolve.o: trivial-rewrite.h resolve.o: trivial-rewrite.h
resolve.o: transport.h resolve.o: transport.h
rewrite.o: rewrite.c rewrite.o: rewrite.c
@ -105,6 +106,7 @@ transport.o: ../include/vbuf.h
transport.o: ../include/split_at.h transport.o: ../include/split_at.h
transport.o: ../include/dict.h transport.o: ../include/dict.h
transport.o: ../include/vstream.h transport.o: ../include/vstream.h
transport.o: ../include/argv.h
transport.o: ../include/mail_params.h transport.o: ../include/mail_params.h
transport.o: ../include/maps.h transport.o: ../include/maps.h
transport.o: transport.h transport.o: transport.h
@ -118,6 +120,7 @@ trivial-rewrite.o: ../include/vstring_vstream.h
trivial-rewrite.o: ../include/split_at.h trivial-rewrite.o: ../include/split_at.h
trivial-rewrite.o: ../include/stringops.h trivial-rewrite.o: ../include/stringops.h
trivial-rewrite.o: ../include/dict.h trivial-rewrite.o: ../include/dict.h
trivial-rewrite.o: ../include/argv.h
trivial-rewrite.o: ../include/mail_params.h trivial-rewrite.o: ../include/mail_params.h
trivial-rewrite.o: ../include/mail_proto.h trivial-rewrite.o: ../include/mail_proto.h
trivial-rewrite.o: ../include/iostuff.h trivial-rewrite.o: ../include/iostuff.h

14
postfix/trivial-rewrite/resolve.c
View File

@ -154,7 +154,7 @@ void resolve_addr(char *addr, VSTRING *channel, VSTRING *nexthop,
/* /*
* Make sure the resolved envelope recipient has the user@domain form. If * Make sure the resolved envelope recipient has the user@domain form. If
* no domain was specified in the address, assume the local machine. See * no domain was specified in the address, assume the local machine. See
* above for what happens with an empty localpart. * above for what happens with an empty address.
*/ */
if (domain == 0) { if (domain == 0) {
if (saved_domain) { if (saved_domain) {
@ -168,11 +168,11 @@ void resolve_addr(char *addr, VSTRING *channel, VSTRING *nexthop,
tok822_internalize(nextrcpt, tree, TOK822_STR_DEFL); tok822_internalize(nextrcpt, tree, TOK822_STR_DEFL);
/* /*
* The transport map overrides the default transport and next-hop host * The transport map overrides any transport and next-hop host info that
* info that was set up just moments ago. For a long time, it was not * is set up below. For a long time, it was not possible to override
* possible to override routing of mail that resolves locally, because * routing of mail that resolves locally, because Postfix used a
* Postfix used a zero-length next-hop hostname result to indicate local * zero-length next-hop hostname result to indicate local delivery, and
* delivery, and transport maps cannot return zero-length hostnames. * transport maps cannot return zero-length hostnames.
*/ */
if (*var_transport_maps if (*var_transport_maps
&& transport_lookup(strrchr(STR(nextrcpt), '@') + 1, channel, nexthop)) { && transport_lookup(strrchr(STR(nextrcpt), '@') + 1, channel, nexthop)) {
@ -194,7 +194,7 @@ void resolve_addr(char *addr, VSTRING *channel, VSTRING *nexthop,
/* /*
* Local delivery. Set up the default local transport and the default * Local delivery. Set up the default local transport and the default
* next-hop hostname. * next-hop hostname (myself).
*/ */
else { else {
vstring_strcpy(channel, def_local_transport()); vstring_strcpy(channel, def_local_transport());

9
postfix/util/Makefile.in
View File

@ -319,6 +319,7 @@ dict.o: vstring.h
dict.o: readlline.h dict.o: readlline.h
dict.o: mac_parse.h dict.o: mac_parse.h
dict.o: dict.h dict.o: dict.h
dict.o: argv.h
dict.o: dict_ht.h dict.o: dict_ht.h
dict_db.o: dict_db.c dict_db.o: dict_db.c
dict_db.o: sys_defs.h dict_db.o: sys_defs.h
@ -331,6 +332,7 @@ dict_db.o: iostuff.h
dict_db.o: myflock.h dict_db.o: myflock.h
dict_db.o: dict.h dict_db.o: dict.h
dict_db.o: vstream.h dict_db.o: vstream.h
dict_db.o: argv.h
dict_db.o: dict_db.h dict_db.o: dict_db.h
dict_dbm.o: dict_dbm.c dict_dbm.o: dict_dbm.c
dict_dbm.o: sys_defs.h dict_dbm.o: sys_defs.h
@ -342,6 +344,7 @@ dict_env.o: safe.h
dict_env.o: dict.h dict_env.o: dict.h
dict_env.o: vstream.h dict_env.o: vstream.h
dict_env.o: vbuf.h dict_env.o: vbuf.h
dict_env.o: argv.h
dict_env.o: dict_env.h dict_env.o: dict_env.h
dict_ht.o: dict_ht.c dict_ht.o: dict_ht.c
dict_ht.o: sys_defs.h dict_ht.o: sys_defs.h
@ -350,6 +353,7 @@ dict_ht.o: htable.h
dict_ht.o: dict.h dict_ht.o: dict.h
dict_ht.o: vstream.h dict_ht.o: vstream.h
dict_ht.o: vbuf.h dict_ht.o: vbuf.h
dict_ht.o: argv.h
dict_ht.o: dict_ht.h dict_ht.o: dict_ht.h
dict_ldap.o: dict_ldap.c dict_ldap.o: dict_ldap.c
dict_ldap.o: sys_defs.h dict_ldap.o: sys_defs.h
@ -365,6 +369,7 @@ dict_nis.o: vstring.h
dict_nis.o: vbuf.h dict_nis.o: vbuf.h
dict_nis.o: dict.h dict_nis.o: dict.h
dict_nis.o: vstream.h dict_nis.o: vstream.h
dict_nis.o: argv.h
dict_nis.o: dict_nis.h dict_nis.o: dict_nis.h
dict_nisplus.o: dict_nisplus.c dict_nisplus.o: dict_nisplus.c
dict_nisplus.o: sys_defs.h dict_nisplus.o: sys_defs.h
@ -374,6 +379,7 @@ dict_nisplus.o: htable.h
dict_nisplus.o: dict.h dict_nisplus.o: dict.h
dict_nisplus.o: vstream.h dict_nisplus.o: vstream.h
dict_nisplus.o: vbuf.h dict_nisplus.o: vbuf.h
dict_nisplus.o: argv.h
dict_nisplus.o: dict_nisplus.h dict_nisplus.o: dict_nisplus.h
dict_open.o: dict_open.c dict_open.o: dict_open.c
dict_open.o: sys_defs.h dict_open.o: sys_defs.h
@ -410,6 +416,7 @@ dict_regexp.o: vstring.h
dict_regexp.o: stringops.h dict_regexp.o: stringops.h
dict_regexp.o: readlline.h dict_regexp.o: readlline.h
dict_regexp.o: dict.h dict_regexp.o: dict.h
dict_regexp.o: argv.h
dict_regexp.o: dict_regexp.h dict_regexp.o: dict_regexp.h
dict_regexp.o: mac_parse.h dict_regexp.o: mac_parse.h
dict_unix.o: dict_unix.c dict_unix.o: dict_unix.c
@ -420,6 +427,7 @@ dict_unix.o: vstring.h
dict_unix.o: vbuf.h dict_unix.o: vbuf.h
dict_unix.o: dict.h dict_unix.o: dict.h
dict_unix.o: vstream.h dict_unix.o: vstream.h
dict_unix.o: argv.h
dict_unix.o: dict_unix.h dict_unix.o: dict_unix.h
dir_forest.o: dir_forest.c dir_forest.o: dir_forest.c
dir_forest.o: sys_defs.h dir_forest.o: sys_defs.h
@ -591,6 +599,7 @@ match_ops.o: split_at.h
match_ops.o: dict.h match_ops.o: dict.h
match_ops.o: vstream.h match_ops.o: vstream.h
match_ops.o: vbuf.h match_ops.o: vbuf.h
match_ops.o: argv.h
match_ops.o: match_ops.h match_ops.o: match_ops.h
match_ops.o: stringops.h match_ops.o: stringops.h
msg.o: msg.c msg.o: msg.c

1
postfix/util/dict.h
View File

@ -102,6 +102,5 @@ extern int dict_changed(void);
/* P.O. Box 704 /* P.O. Box 704
/* Yorktown Heights, NY 10598, USA /* Yorktown Heights, NY 10598, USA
/*--*/ /*--*/
/**INDENT** Error@47: Unmatched #endif */
#endif #endif

2
postfix/util/sys_defs.h
View File

@ -91,6 +91,7 @@ extern int opterr;
#define S_ISSOCK(mode) (((mode) & (S_IFMT)) == (S_IFSOCK)) #define S_ISSOCK(mode) (((mode) & (S_IFMT)) == (S_IFSOCK))
#define DUP2_DUPS_CLOSE_ON_EXEC #define DUP2_DUPS_CLOSE_ON_EXEC
#define MISSING_USLEEP #define MISSING_USLEEP
#define NO_HERRNO
#endif #endif
#ifdef OSF1 #ifdef OSF1
@ -145,6 +146,7 @@ extern int opterr;
#define USE_STATFS #define USE_STATFS
#define STATFS_IN_SYS_VFS_H #define STATFS_IN_SYS_VFS_H
#define memmove(d,s,l) bcopy(s,d,l) #define memmove(d,s,l) bcopy(s,d,l)
#define NO_HERRNO
#endif #endif
#ifdef SUNOS5 #ifdef SUNOS5

4
postfix/util/watchdog.c
View File

@ -155,7 +155,11 @@ WATCHDOG *watchdog_create(unsigned timeout, WATCHDOG_FN action, char *context)
wp->saved_watchdog = watchdog_curr; wp->saved_watchdog = watchdog_curr;
wp->saved_time = alarm(0); wp->saved_time = alarm(0);
sigemptyset(&sig_action.sa_mask); sigemptyset(&sig_action.sa_mask);
#ifdef SA_RESTART
sig_action.sa_flags = SA_RESTART; sig_action.sa_flags = SA_RESTART;
#else
sig_action.sa_flags = 0;
#endif
sig_action.sa_handler = watchdog_event; sig_action.sa_handler = watchdog_event;
if (sigaction(SIGALRM, &sig_action, &wp->saved_action) < 0) if (sigaction(SIGALRM, &sig_action, &wp->saved_action) < 0)
msg_fatal("%s: sigaction(SIGALRM): %m", myname); msg_fatal("%s: sigaction(SIGALRM): %m", myname);