]>
Commit | Line | Data |
---|---|---|
830ba608 | 1 | diff -Nur postfix-1.1.2.orig/conf/main.cf postfix-1.1.2/conf/main.cf |
2 | --- postfix-1.1.2.orig/conf/main.cf Tue Jan 15 15:27:55 2002 | |
3 | +++ postfix-1.1.2/conf/main.cf Wed Jan 30 13:09:30 2002 | |
447bfc58 | 4 | @@ -38,7 +38,7 @@ |
320b372d AM |
5 | # default value is $program_directory. This directory must be owned |
6 | # by root. | |
7 | # | |
9e5ab0fc | 8 | -daemon_directory = /usr/libexec/postfix |
320b372d AM |
9 | +daemon_directory = /usr/lib/postfix |
10 | ||
11 | # QUEUE AND PROCESS OWNERSHIP | |
12 | # | |
447bfc58 | 13 | @@ -56,7 +56,7 @@ |
a281e397 AM |
14 | # These rights are used in the absence of a recipient user context. |
15 | # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. | |
16 | # | |
17 | -#default_privs = nobody | |
18 | +default_privs = nobody | |
19 | ||
20 | # INTERNET HOST AND DOMAIN NAMES | |
21 | # | |
447bfc58 | 22 | @@ -84,7 +84,7 @@ |
35e20fbe AM |
23 | # a domain-wide alias database that aliases each user to |
24 | # user@that.users.mailhost. | |
a281e397 | 25 | # |
35e20fbe | 26 | -#myorigin = $myhostname |
35e20fbe | 27 | +myorigin = $myhostname |
9e9007a1 | 28 | #myorigin = $mydomain |
a281e397 | 29 | |
a281e397 | 30 | # RECEIVING MAIL |
447bfc58 | 31 | @@ -296,7 +296,7 @@ |
a281e397 AM |
32 | # "postfix reload" to eliminate the delay. |
33 | # | |
34 | #alias_maps = dbm:/etc/aliases | |
35 | -#alias_maps = hash:/etc/aliases | |
36 | +alias_maps = hash:/etc/mail/aliases | |
37 | #alias_maps = hash:/etc/aliases, nis:mail.aliases | |
9e5ab0fc | 38 | #alias_maps = netinfo:/aliases |
a281e397 | 39 | |
447bfc58 | 40 | @@ -307,7 +307,7 @@ |
320b372d AM |
41 | # |
42 | #alias_database = dbm:/etc/aliases | |
43 | #alias_database = dbm:/etc/mail/aliases | |
44 | -#alias_database = hash:/etc/aliases | |
45 | +alias_database = hash:/etc/mail/aliases | |
46 | #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases | |
47 | ||
4070b073 | 48 | # ADDRESS EXTENSIONS (e.g., user+foo) |
447bfc58 | 49 | @@ -335,7 +335,7 @@ |
35e20fbe AM |
50 | # UNIX-style mailboxes are kept. The default setting depends on the |
51 | # system type. | |
a281e397 | 52 | # |
447bfc58 | 53 | -#mail_spool_directory = /var/mail |
35e20fbe | 54 | +mail_spool_directory = /var/mail |
447bfc58 | 55 | #mail_spool_directory = /var/spool/mail |
a281e397 | 56 | |
35e20fbe | 57 | # The mailbox_command parameter specifies the optional external |
447bfc58 | 58 | @@ -357,8 +357,8 @@ |
4070b073 AF |
59 | # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN |
60 | # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. | |
61 | # | |
62 | -#mailbox_command = /some/where/procmail | |
63 | -#mailbox_command = /some/where/procmail -a "$EXTENSION" | |
64 | +#mailbox_command = /usr/bin/procmail | |
dbc4c78b | 65 | +#mailbox_command = /usr/bin/procmail -a "$EXTENSION" |
4070b073 AF |
66 | |
67 | # The mailbox_transport specifies the optional transport in master.cf | |
68 | # to use after processing aliases and .forward files. This parameter | |
830ba608 | 69 | @@ -502,39 +502,12 @@ |
70 | PATH=/usr/bin:/usr/X11R6/bin | |
320b372d AM |
71 | xxgdb $daemon_directory/$process_name $process_id & sleep 5 |
72 | ||
320b372d | 73 | +biff = no |
830ba608 | 74 | # INSTALL-TIME CONFIGURATION INFORMATION |
75 | # | |
76 | # The following parameters are used when installing a new Postfix version. | |
77 | -# | |
78 | -# sendmail_path: The full pathname of the Postfix sendmail command. | |
79 | -# This is the Sendmail-compatible mail posting interface. | |
80 | -# | |
81 | -sendmail_path = | |
82 | - | |
83 | -# newaliases_path: The full pathname of the Postfix newaliases command. | |
84 | -# This is the Sendmail-compatible command to build alias databases. | |
85 | -# | |
86 | -newaliases_path = | |
87 | - | |
88 | -# mailq_path: The full pathname of the Postfix mailq command. This | |
89 | -# is the Sendmail-compatible mail queue listing command. | |
90 | -# | |
91 | -mailq_path = | |
92 | - | |
93 | # setgid_group: The group for mail submission and queue management | |
94 | # commands. This must be a group name with a numerical group ID that | |
95 | # is not shared with other accounts, not even with the Postfix account. | |
96 | # | |
97 | -setgid_group = | |
98 | - | |
99 | -# manpage_directory: The location of the Postfix on-line manual pages. | |
100 | -# | |
101 | -manpage_directory = | |
102 | - | |
103 | -# sample_directory: The location of the Postfix sample configuration files. | |
104 | -# | |
105 | -sample_directory = | |
106 | - | |
107 | -# readme_directory: The location of the Postfix README files. | |
108 | -# | |
109 | -readme_directory = | |
110 | +setgid_group = maildrop | |
111 | diff -Nur postfix-1.1.2.orig/src/global/mail_params.h postfix-1.1.2/src/global/mail_params.h | |
112 | --- postfix-1.1.2.orig/src/global/mail_params.h Tue Jan 15 16:24:34 2002 | |
113 | +++ postfix-1.1.2/src/global/mail_params.h Wed Jan 30 13:08:29 2002 | |
114 | @@ -50,7 +50,7 @@ | |
115 | extern gid_t var_owner_gid; | |
116 | ||
117 | #define VAR_SGID_GROUP "setgid_group" | |
118 | -#define DEF_SGID_GROUP "postdrop" | |
119 | +#define DEF_SGID_GROUP "maildrop" | |
120 | extern char *var_sgid_group; | |
121 | extern gid_t var_sgid_gid; | |
122 | ||
123 | @@ -203,7 +203,7 @@ | |
447bfc58 GS |
124 | */ |
125 | #define VAR_CONFIG_DIR "config_directory" | |
126 | #ifndef DEF_CONFIG_DIR | |
127 | -#define DEF_CONFIG_DIR "/etc/postfix" | |
128 | +#define DEF_CONFIG_DIR "/etc/mail" | |
129 | #endif | |
130 | extern char *var_config_dir; | |
131 | ||
830ba608 | 132 | diff -Nur postfix-1.1.2.orig/src/util/sys_defs.h postfix-1.1.2/src/util/sys_defs.h |
133 | --- postfix-1.1.2.orig/src/util/sys_defs.h Thu Jan 3 20:20:56 2002 | |
134 | +++ postfix-1.1.2/src/util/sys_defs.h Wed Jan 30 13:08:29 2002 | |
135 | @@ -484,7 +484,7 @@ | |
447bfc58 GS |
136 | #define HAS_FSYNC |
137 | #define HAS_DB | |
138 | #define DEF_DB_TYPE "hash" | |
139 | -#define ALIAS_DB_MAP "hash:/etc/aliases" | |
140 | +#define ALIAS_DB_MAP "hash:/etc/mail/aliases" | |
141 | #define HAS_NIS | |
142 | #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0) | |
143 | #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin" |