-diff -urN snapshot-19990518.orig/conf/aliases snapshot-19990518/conf/aliases
---- snapshot-19990518.orig/conf/aliases Mon May 24 07:07:03 1999
-+++ snapshot-19990518/conf/aliases Mon May 24 07:10:13 1999
-@@ -5,26 +5,29 @@
+diff -dur postfix-2.1.3.orig/conf/main.cf postfix-2.1.3/conf/main.cf
+--- postfix-2.1.3.orig/conf/main.cf 2004-06-06 23:53:58.000000000 +0200
++++ postfix-2.1.3/conf/main.cf 2004-06-22 14:23:20.533313840 +0200
+@@ -38,7 +38,7 @@
+ # daemon programs (i.e. programs listed in the master.cf file). This
+ # directory must be owned by root.
#
+-daemon_directory = /usr/libexec/postfix
++daemon_directory = /usr/lib/postfix
- # Basic system aliases -- these MUST be present
-+
-+# Main system alias
-+hostmaster: root
-+
- MAILER-DAEMON: postmaster
--postmaster: root
-+postmaster: hostmaster
-
- # General redirections for pseudo accounts
--bin: root
--daemon: root
--named: root
--nobody: root
--operator: root
--uucp: root
--www: root
--ftp-bugs: root
-+bin: hostmaster
-+daemon: hostmaster
-+named: hosmaster
-+nobody: hosmaster
-+operator: hosmaster
-+uucp: hostmaster
-+www: hosmaster
-+ftp-bugs: hostmaster
-+ircmaster: hostmaster
-+newsmaster: hostmaster
-+webmaster: hostmaster
-+sysadm: hostmaster
-
- # Put your local aliases here.
-
--# Well-known aliases -- these should be filled in!
--# root:
--# manager:
--# dumper:
--# operator:
-
- #++
- # NAME
-diff -urN snapshot-19990518.orig/conf/main.cf snapshot-19990518/conf/main.cf
---- snapshot-19990518.orig/conf/main.cf Mon May 24 07:07:03 1999
-+++ snapshot-19990518/conf/main.cf Mon May 24 07:17:14 1999
-@@ -18,7 +18,7 @@
- # Postfix support programs and daemons. This setting can be overruled
- # with the command_directory and daemon_directory parameters.
+ # QUEUE AND PROCESS OWNERSHIP
#
--program_directory = /some/where/postfix/bin
-+program_directory = /usr/sbin
-
- # The command_directory parameter specifies the location of all
- # postXXX commands. The default value is $program_directory.
-@@ -40,14 +40,14 @@
- # OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM. In particular,
- # don't specify nobody or daemon. PLEASE USE A DEDICATED USER.
- #
--#mail_owner = postfix
-+mail_owner = postfix
-
- # The default_privs parameter specifies the default rights used by
- # the local delivery agent for delivery to external file or command.
+@@ -56,7 +56,7 @@
# These rights are used in the absence of a recipient user context.
# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
#
# INTERNET HOST AND DOMAIN NAMES
#
-@@ -75,8 +75,8 @@
- # a domain-wide alias database that aliases each user to
- # user@that.users.mailhost.
+@@ -88,7 +88,7 @@
+ # myorigin also specifies the default domain name that is appended
+ # to recipient addresses that have no @domain part.
#
-#myorigin = $myhostname
--#myorigin = $mydomain
+myorigin = $myhostname
-+myorigin = $mydomain
+ #myorigin = $mydomain
# RECEIVING MAIL
-
-@@ -85,7 +85,7 @@
- # the software claims all active interfaces on the machine. The
- # parameter also controls delivery of mail to user@[ip.address].
- #
--#inet_interfaces = all
-+inet_interfaces = all
- #inet_interfaces = $myhostname
- #inet_interfaces = $myhostname, localhost
-
-@@ -110,8 +110,8 @@
- #
- #mydestination = $myhostname, localhost.$mydomain
- #mydestination = $myhostname, localhost.$mydomain $mydomain
--#mydestination = $myhostname, localhost.$mydomain, $mydomain,
--# mail.$mydomain, www.$mydomain, ftp.$mydomain
-+mydestination = $myhostname, localhost.$mydomain, $mydomain,
-+ mail.$mydomain, www.$mydomain, ftp.$mydomain
-
- # INTERNET VERSUS INTRANET
- #
-@@ -179,7 +179,7 @@
+@@ -372,7 +372,7 @@
# "postfix reload" to eliminate the delay.
#
#alias_maps = dbm:/etc/aliases
-#alias_maps = hash:/etc/aliases
+alias_maps = hash:/etc/mail/aliases
#alias_maps = hash:/etc/aliases, nis:mail.aliases
+ #alias_maps = netinfo:/aliases
- # The alias_database parameter specifies the alias database(s) that
-@@ -217,7 +217,7 @@
+@@ -383,7 +383,7 @@
+ #
+ #alias_database = dbm:/etc/aliases
+ #alias_database = dbm:/etc/mail/aliases
+-#alias_database = hash:/etc/aliases
++alias_database = hash:/etc/mail/aliases
+ #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
+
+ # ADDRESS EXTENSIONS (e.g., user+foo)
+@@ -411,7 +411,7 @@
# UNIX-style mailboxes are kept. The default setting depends on the
# system type.
#
--# mail_spool_directory = /var/mail
+-#mail_spool_directory = /var/mail
+mail_spool_directory = /var/mail
- # mail_spool_directory = /var/spool/mail
+ #mail_spool_directory = /var/spool/mail
# The mailbox_command parameter specifies the optional external
-diff -urN snapshot-19990518.orig/conf/sample-aliases.cf snapshot-19990518/conf/sample-aliases.cf
---- snapshot-19990518.orig/conf/sample-aliases.cf Mon May 24 07:07:03 1999
-+++ snapshot-19990518/conf/sample-aliases.cf Mon May 24 07:16:53 1999
-@@ -12,7 +12,7 @@
+@@ -433,8 +433,8 @@
+ # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN
+ # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER.
#
- # alias_database = dbm:/etc/aliases
- # alias_database = dbm:/etc/mail/aliases
--alias_database = hash:/etc/aliases
-+alias_database = hash:/etc/mail/aliases
-
- # The alias_maps parameter specifies the list of alias databases used
- # by the local delivery agent. The default list is system dependent.
-@@ -29,4 +29,4 @@
- #
- # alias_maps = dbm:/etc/aliases, nis:mail.aliases
- # alias_maps = hash:/etc/aliases
--alias_maps = hash:/etc/aliases
-+alias_maps = hash:/etc/mail/aliases
-diff -urN snapshot-19990518.orig/global/mail_params.h snapshot-19990518/global/mail_params.h
---- snapshot-19990518.orig/global/mail_params.h Mon May 24 07:07:02 1999
-+++ snapshot-19990518/global/mail_params.h Mon May 24 07:19:08 1999
-@@ -180,7 +180,7 @@
- */
- #define VAR_CONFIG_DIR "config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR "/etc/postfix"
-+#define DEF_CONFIG_DIR "/etc/mail"
- #endif
- extern char *var_config_dir;
-
-diff -urN snapshot-19990518.orig/util/sys_defs.h snapshot-19990518/util/sys_defs.h
---- snapshot-19990518.orig/util/sys_defs.h Mon May 24 07:07:02 1999
-+++ snapshot-19990518/util/sys_defs.h Mon May 24 07:19:31 1999
-@@ -31,7 +31,7 @@
+-#mailbox_command = /some/where/procmail
+-#mailbox_command = /some/where/procmail -a "$EXTENSION"
++#mailbox_command = /usr/bin/procmail
++#mailbox_command = /usr/bin/procmail -a "$EXTENSION"
+
+ # The mailbox_transport specifies the optional transport in master.cf
+ # to use after processing aliases and .forward files. This parameter
+@@ -588,44 +588,22 @@
+ # echo where) | gdb $daemon_directory/$process_name $process_id 2>&1
+ # >$config_directory/$process_name.$process_id.log & sleep 5
+
++biff = no
+ # INSTALL-TIME CONFIGURATION INFORMATION
+ #
+ # The following parameters are used when installing a new Postfix version.
+-#
+-# sendmail_path: The full pathname of the Postfix sendmail command.
+-# This is the Sendmail-compatible mail posting interface.
+-#
+-sendmail_path =
+-
+-# newaliases_path: The full pathname of the Postfix newaliases command.
+-# This is the Sendmail-compatible command to build alias databases.
+-#
+-newaliases_path =
+-
+-# mailq_path: The full pathname of the Postfix mailq command. This
+-# is the Sendmail-compatible mail queue listing command.
+-#
+-mailq_path =
+
+ # setgid_group: The group for mail submission and queue management
+ # commands. This must be a group name with a numerical group ID that
+ # is not shared with other accounts, not even with the Postfix account.
+ #
+-setgid_group =
+-
+-# html_directory: The location of the Postfix HTML documentation.
+-#
+-html_directory =
+-
+-# manpage_directory: The location of the Postfix on-line manual pages.
+-#
+-manpage_directory =
+-
+-# sample_directory: The location of the Postfix sample configuration files.
+-# This parameter is obsolete as of Postfix 2.1.
+-#
+-sample_directory =
++setgid_group = maildrop
+
+-# readme_directory: The location of the Postfix README files.
+-#
+-readme_directory =
++# The unknown_address_reject_code parameter specifies the SMTP server
++# response when a client violates the reject_unknown_sender_domain
++# or reject_unknown_recipient_domain restrictions.
++#
++# Contrary to what Wietse thinks (450) this should be 550
++#
++unknown_address_reject_code = 550
++
+diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/mail_params.h
+--- postfix-2.1.3.orig/src/global/mail_params.h 2004-06-22 14:20:57.890585644 +0200
++++ postfix-2.1.3/src/global/mail_params.h 2004-06-22 14:21:17.963422126 +0200
+@@ -64,7 +64,7 @@
+ extern gid_t var_owner_gid;
+
+ #define VAR_SGID_GROUP "setgid_group"
+-#define DEF_SGID_GROUP "postdrop"
++#define DEF_SGID_GROUP "maildrop"
+ extern char *var_sgid_group;
+ extern gid_t var_sgid_gid;
+
+#@@ -231,7 +231,7 @@
+# */
+# #define VAR_CONFIG_DIR "config_directory"
+# #ifndef DEF_CONFIG_DIR
+#-#define DEF_CONFIG_DIR "/etc/postfix"
+#+#define DEF_CONFIG_DIR "/etc/mail"
+# #endif
+# extern char *var_config_dir;
+#
+diff -dur postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_defs.h
+--- postfix-2.1.3.orig/src/util/sys_defs.h 2004-06-22 14:20:58.094573821 +0200
++++ postfix-2.1.3/src/util/sys_defs.h 2004-06-22 14:21:17.966421952 +0200
+@@ -550,7 +550,7 @@
+ #define HAS_FSYNC
#define HAS_DB
- #define HAS_SA_LEN
#define DEF_DB_TYPE "hash"
-#define ALIAS_DB_MAP "hash:/etc/aliases"
+#define ALIAS_DB_MAP "hash:/etc/mail/aliases"
+ #define HAS_NIS
#define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
- #define USE_STATFS
projects / packages / postfix.git / blobdiff