20121226
- Miscellaneous cleanups of postconf internal APIs,
- identifiers and comments. No changes in behavior.
+ Miscellaneous cleanups of postconf internal APIs, identifiers
+ and comments. No changes in behavior.
- Bugfix (omission in feature 20111203): the SMTP server
+ Bugfix (omission in feature 20111203): the SMTP server only
supported time-dependent address-verification sender addresses
- only with RCPT TO but not with MAIL FROM. File: smtpd/smtpd.c.
+ with RCPT TO but not with MAIL FROM. File: smtpd/smtpd.c.
+
+20121227
+
+ Feature: "postconf -o name=value" support to override main.cf
+ settings (for example, "postconf -x -o stress=whatever"
+ shows effective settings under overload). Files:
+ postconf/postconf.c, postconf/postconf_main.c.
- "postconf -x" now expands $name in main.cf and master.cf parameter
values.
-- "postconf -Mn" now shows only master.cf entries with "-o name=value"
- parameter settings.
+- "postconf -Mn" now shows services that have "-o name=value"
+ parameter settings in master.cf.
- postconf warns about attempts to modify a read-only parameter
(process_name, process_id) in main.cf or master.cf.
main.cf or master.cf (except for backwards-compatibility parameters
such as $virtual_maps).
+Added with snapshot 20121227:
+
+- "postconf -o name=value" overrides main.cf parameter settings.
+ This can be used, for example, to examine stress-dependent settings
+ with "postconf -x -o stress=yes".
+
Incompatible changes with snapshot 20121123
===========================================
Don't forget Apple's code donation for fetching mail from
IMAP server.
+ Should postconf -o refuse to work without the -x option?
+
Make errno white/blacklist for getpwnam_r etc. and mailbox
write errors.
<b>SYNOPSIS</b>
<b>Managing <a href="postconf.5.html">main.cf</a>:</b>
- <b>postconf</b> [<b>-dfhnvx</b>] [<b>-c</b> <i>config</i><b>_</b><i>dir</i>] [<b>-C</b> <i>class,...</i>] [<i>parame-</i>
- <i>ter ...</i>]
+ <b>postconf</b> [<b>-dfhnovx</b>] [<b>-c</b> <i>config</i><b>_</b><i>dir</i>] [<b>-C</b> <i>class,...</i>] [<i>param-</i>
+ <i>eter ...</i>]
<b>postconf</b> [<b>-ev</b>] [<b>-c</b> <i>config</i><b>_</b><i>dir</i>] [<i>parameter=value ...</i>]
<b>Managing <a href="master.5.html">master.cf</a>:</b>
- <b>postconf</b> [<b>-fMnvx</b>] [<b>-c</b> <i>config</i><b>_</b><i>dir</i>] [<i>service ...</i>]
+ <b>postconf</b> [<b>-fMnovx</b>] [<b>-c</b> <i>config</i><b>_</b><i>dir</i>] [<i>service ...</i>]
<b>Managing bounce message templates:</b>
for human readability (Postfix 2.9 and later).
<b>-e</b> Edit the <a href="postconf.5.html"><b>main.cf</b></a> configuration file, and update
- parameter settings with the "<i>name</i>=<i>value</i>" pairs on
+ parameter settings with the "<i>name=value</i>" pairs on
the <a href="postconf.1.html"><b>postconf</b>(1)</a> command line. The file is copied to
a temporary file then renamed into place. Specify
quotes to protect special characters and whitespace
This feature is available with Postfix 2.9 and
later.
- <b>-n</b> Print only <i>name</i>=<i>value</i> parameter settings that are
- explicitly specified in <a href="postconf.5.html"><b>main.cf</b></a>. When specified
- with <b>-M</b>, print only <a href="master.5.html"><b>master.cf</b></a> entries that have "-o
- <i>name</i>=<i>value</i>" parameter settings (Postfix 2.10 and
- later). Specify <b>-nf</b> to fold long lines for human
- readability (Postfix 2.9 and later).
+ <b>-n</b> Show only configuration parameters that have
+ explicit <i>name=value</i> settings in <a href="postconf.5.html"><b>main.cf</b></a>. When
+ specified with <b>-M</b>, show only services that have
+ explicit "-o <i>name=value</i>" settings in <a href="master.5.html"><b>master.cf</b></a>
+ (Postfix 2.10 and later). Specify <b>-nf</b> to fold long
+ lines for human readability (Postfix 2.9 and
+ later).
+
+ <b>-o</b> <i>name=value</i>
+ Override <a href="postconf.5.html"><b>main.cf</b></a> parameter settings.
+
+ This feature is available with Postfix 2.10 and
+ later.
<b>-t</b> [<i>template</i><b>_</b><i>file</i>]
Display the templates for text that appears at the
parameters named on the <a href="postconf.1.html"><b>postconf</b>(1)</a> command line.
The file is copied to a temporary file then renamed
into place. Specify a list of parameter names, not
- "<i>name
</i>=<i>value</i>" pairs. There is no <a href="postconf.1.html"><b>postconf</b>(1)</a> com-
+ "<i>name
=value</i>" pairs. There is no <a href="postconf.1.html"><b>postconf</b>(1)</a> com-
mand to perform the reverse operation.
This feature is available with Postfix 2.10 and
line, so that those parameters revert to their
default values. The file is copied to a temporary
file then renamed into place. Specify a list of
- parameter names, not "<i>name</i>=<i>value</i>" pairs. There is
+ parameter names, not "<i>name=value</i>" pairs. There is
no <a href="postconf.1.html"><b>postconf</b>(1)</a> command to perform the reverse oper-
ation.
.fi
\fBManaging main.cf:\fR
-\fBpostconf\fR [\fB-dfhnvx\fR] [\fB-c \fIconfig_dir\fR]
+\fBpostconf\fR [\fB-dfhnovx\fR] [\fB-c \fIconfig_dir\fR]
[\fB-C \fIclass,...\fR] [\fIparameter ...\fR]
\fBpostconf\fR [\fB-ev\fR] [\fB-c \fIconfig_dir\fR]
\fBManaging master.cf:\fR
-\fBpostconf\fR [\fB-fMnvx\fR] [\fB-c \fIconfig_dir\fR]
+\fBpostconf\fR [\fB-fMnovx\fR] [\fB-c \fIconfig_dir\fR]
[\fIservice ...\fR]
\fBManaging bounce message templates:\fR
(Postfix 2.9 and later).
.IP \fB-e\fR
Edit the \fBmain.cf\fR configuration file, and update
-parameter settings with the "\fIname\fR=\fIvalue\fR" pairs
+parameter settings with the "\fIname=value\fR" pairs
on the \fBpostconf\fR(1) command line. The file is copied
to a temporary file then renamed into place.
Specify quotes to protect special characters and whitespace
This feature is available with Postfix 2.9 and later.
.IP \fB-n\fR
-Print only \fIname\fR=\fIvalue\fR parameter settings that
-are explicitly specified in \fBmain.cf\fR. When specified
-with \fB-M\fR, print only \fBmaster.cf\fR entries that have
-"-o \fIname\fR=\fIvalue\fR" parameter settings (Postfix
-2.10 and later).
+Show only configuration parameters that have explicit
+\fIname=value\fR settings in \fBmain.cf\fR.
+When specified with \fB-M\fR, show only services that have
+explicit "-o \fIname=value\fR" settings in \fBmaster.cf\fR
+(Postfix 2.10 and later).
Specify \fB-nf\fR to fold long lines for human readability
(Postfix 2.9 and later).
+.IP "\fB-o \fIname=value\fR"
+Override \fBmain.cf\fR parameter settings.
+
+This feature is available with Postfix 2.10 and later.
.IP "\fB-t\fR [\fItemplate_file\fR]"
Display the templates for text that appears at the beginning
of delivery status notification (DSN) messages, without
the parameters named on the \fBpostconf\fR(1) command line.
The file is copied to a temporary file then renamed into
place.
-Specify a list of parameter names, not "\fIname\fR=\fIvalue\fR"
+Specify a list of parameter names, not "\fIname=value\fR"
pairs. There is no \fBpostconf\fR(1) command to perform
the reverse operation.
so that those parameters revert to their default values.
The file is copied to a temporary file then renamed into
place.
-Specify a list of parameter names, not "\fIname\fR=\fIvalue\fR"
+Specify a list of parameter names, not "\fIname=value\fR"
pairs. There is no \fBpostconf\fR(1) command to perform
the reverse operation.
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
-#define MAIL_RELEASE_DATE "20121226"
+#define MAIL_RELEASE_DATE "20121227"
#define MAIL_VERSION_NUMBER "2.10"
#ifdef SNAPSHOT
/* .fi
/* \fBManaging main.cf:\fR
/*
-/* \fBpostconf\fR [\fB-dfhnvx\fR] [\fB-c \fIconfig_dir\fR]
+/* \fBpostconf\fR [\fB-dfhnovx\fR] [\fB-c \fIconfig_dir\fR]
/* [\fB-C \fIclass,...\fR] [\fIparameter ...\fR]
/*
/* \fBpostconf\fR [\fB-ev\fR] [\fB-c \fIconfig_dir\fR]
/*
/* \fBManaging master.cf:\fR
/*
-/* \fBpostconf\fR [\fB-fMnvx\fR] [\fB-c \fIconfig_dir\fR]
+/* \fBpostconf\fR [\fB-fMnovx\fR] [\fB-c \fIconfig_dir\fR]
/* [\fIservice ...\fR]
/*
/* \fBManaging bounce message templates:\fR
/* (Postfix 2.9 and later).
/* .IP \fB-e\fR
/* Edit the \fBmain.cf\fR configuration file, and update
-/* parameter settings with the "\fIname\fR=\fIvalue\fR" pairs
+/* parameter settings with the "\fIname=value\fR" pairs
/* on the \fBpostconf\fR(1) command line. The file is copied
/* to a temporary file then renamed into place.
/* Specify quotes to protect special characters and whitespace
/*
/* This feature is available with Postfix 2.9 and later.
/* .IP \fB-n\fR
-/* Print only \fIname\fR=\fIvalue\fR parameter settings that
-/* are explicitly specified in \fBmain.cf\fR. When specified
-/* with \fB-M\fR, print only \fBmaster.cf\fR entries that have
-/* "-o \fIname\fR=\fIvalue\fR" parameter settings (Postfix
-/* 2.10 and later).
+/* Show only configuration parameters that have explicit
+/* \fIname=value\fR settings in \fBmain.cf\fR.
+/* When specified with \fB-M\fR, show only services that have
+/* explicit "-o \fIname=value\fR" settings in \fBmaster.cf\fR
+/* (Postfix 2.10 and later).
/* Specify \fB-nf\fR to fold long lines for human readability
/* (Postfix 2.9 and later).
+/* .IP "\fB-o \fIname=value\fR"
+/* Override \fBmain.cf\fR parameter settings.
+/*
+/* This feature is available with Postfix 2.10 and later.
/* .IP "\fB-t\fR [\fItemplate_file\fR]"
/* Display the templates for text that appears at the beginning
/* of delivery status notification (DSN) messages, without
/* the parameters named on the \fBpostconf\fR(1) command line.
/* The file is copied to a temporary file then renamed into
/* place.
-/* Specify a list of parameter names, not "\fIname\fR=\fIvalue\fR"
+/* Specify a list of parameter names, not "\fIname=value\fR"
/* pairs. There is no \fBpostconf\fR(1) command to perform
/* the reverse operation.
/*
/* so that those parameters revert to their default values.
/* The file is copied to a temporary file then renamed into
/* place.
-/* Specify a list of parameter names, not "\fIname\fR=\fIvalue\fR"
+/* Specify a list of parameter names, not "\fIname=value\fR"
/* pairs. There is no \fBpostconf\fR(1) command to perform
/* the reverse operation.
/*
#include <stringops.h>
#include <name_mask.h>
#include <warn_stat.h>
+#include <mymalloc.h>
/* Global library. */
"all", PC_PARAM_MASK_CLASS,
0,
};
+ ARGV *override_params = 0;
/*
* Fingerprint executables and core dumps.
/*
* Parse JCL.
*/
- while ((ch = GETOPT(argc, argv, "aAbc:C:deEf#hlmMntvxX")) > 0) {
+ while ((ch = GETOPT(argc, argv, "aAbc:C:deEf#hlmMno:tvxX")) > 0) {
switch (ch) {
case 'a':
cmd_mode |= SHOW_SASL_SERV;
case 'f':
cmd_mode |= FOLD_LINE;
break;
-
case '#':
cmd_mode = COMMENT_OUT;
break;
-
case 'h':
cmd_mode &= ~SHOW_NAME;
break;
case 'n':
cmd_mode |= SHOW_NONDEF;
break;
+ case 'o':
+ if (override_params == 0)
+ override_params = argv_alloc(2);
+ argv_add(override_params, optarg, (char *) 0);
+ break;
case 't':
if (ext_argv)
msg_fatal("specify one of -b and -t");
msg_fatal("do not specify -x with -a, -A, -b, -e, -#, -l, -m, or -X");
if ((cmd_mode & SHOW_NONDEF) != 0 && junk != 0 && junk != SHOW_MASTER)
msg_fatal("do not specify -n with -a, -A, -b, -d, -e, -#, -l, -m, or -X");
+ if (override_params != 0 && junk != 0 && junk != SHOW_MASTER)
+ msg_fatal("do not specify -o with -a, -A, -b, -d, -e, -#, -l, -m, or -X");
/*
* Display bounce template information and exit.
else if (cmd_mode & SHOW_MASTER) {
read_master(FAIL_ON_OPEN_ERROR);
read_parameters();
+ if (override_params)
+ set_parameters(override_params->argv);
register_builtin_parameters(basename(argv[0]), getpid());
register_service_parameters();
register_user_parameters();
else {
if ((cmd_mode & SHOW_DEFS) == 0) {
read_parameters();
+ if (override_params)
+ set_parameters(override_params->argv);
}
register_builtin_parameters(basename(argv[0]), getpid());
* postconf_main.c
*/
extern void read_parameters(void);
-extern void set_parameters(void);
+extern void set_parameters(char **);
extern void show_parameters(int, int, char **);
/*
/* DESCRIPTION
/* read_parameters() reads parameters from main.cf.
/*
+/* set_parameters() takes an array of \fIname=value\fR pairs
+/* and overrides settings read with read_parameters().
+/*
/* show_parameters() writes main.cf parameters to the standard
/* output stream.
/*
myfree(path);
}
+/* set_parameters - add or override name=value pairs */
+
+void set_parameters(char **name_val_array)
+{
+ char *name, *value, *junk;
+ const char *err;
+ char **cpp;
+
+ for (cpp = name_val_array; *cpp; cpp++) {
+ junk = mystrdup(*cpp);
+ if ((err = split_nameval(junk, &name, &value)) != 0)
+ msg_fatal("invalid parameter override: %s: %s", *cpp, err);
+ mail_conf_update(name, value);
+ myfree(junk);
+ }
+}
+
/* print_line - show line possibly folded, and with normalized whitespace */
static void print_line(int mode, const char *fmt,...)
projects / thirdparty / postfix.git / commitdiff
