settings (for example, "postconf -x -o stress=whatever"
shows effective settings under overload). Files:
postconf/postconf.c, postconf/postconf_main.c.
+
+20121230
+
+ Cleanup: postconf(1) master.cf options parser. Files:
+ postconf/postconf_master.c, postconf/postconf_user.c.
+
+ Bugfix (omission in feature 20111106): the postconf(1)
+ master.cf options parser didn't support "clusters" of
+ command-line option letters. Files: postconf/postconf_master.c,
+ postconf/test40.ref.
Should postconf -o refuse to work without the -x option?
+ Make 30s caching (feature 20070414) configurable, such that
+ 0 means no caching.
+
Make errno white/blacklist for getpwnam_r etc. and mailbox
write errors.
creating a file named <i>filename</i><b>.lock</b>. The
application is expected to remove its own
lock file, as well as stale lock files that
- were left behind after abnormal termination.
+ were left behind after abnormal program ter-
+ mination.
<b>-m</b> List the names of all supported lookup table types.
In Postfix configuration files, lookup tables are
An application-level locking method. An application locks a file
named \fIfilename\fR by creating a file named \fIfilename\fB.lock\fR.
The application is expected to remove its own lock file, as well as
-stale lock files that were left behind after abnormal termination.
+stale lock files that were left behind after abnormal program
+termination.
.RE
.IP \fB-m\fR
List the names of all supported lookup table types. In Postfix
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
-#define MAIL_RELEASE_DATE "20121227"
+#define MAIL_RELEASE_DATE "20130101"
#define MAIL_VERSION_NUMBER "2.10"
#ifdef SNAPSHOT
tests: test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 \
test12 test13 test14 test15 test16 test17 test18 test19 test20 test21 \
test22 test23 test24 test25 test26 test27 test28 test29 test30 test4b \
- test31 test32 test33 test34 test35 test36 test37 test38 test39
+ test31 test32 test33 test34 test35 test36 test37 test38 test39 test40
root_tests:
diff test39.ref test39.tmp
rm -f main.cf master.cf test39.tmp
+test40: $(PROG) test40.ref
+ rm -f main.cf master.cf
+ touch main.cf master.cf
+ echo foo unix - n n - 0 other >> master.cf
+ echo ' -voaaa=bbb' >> master.cf
+ echo ' -vo ccc=$$aaa' >> master.cf
+ echo ' -v -oddd=$$ccc' >> master.cf
+ ./$(PROG) -Mfxc . unix >test40.tmp 2>&1
+ diff test40.ref test40.tmp
+ rm -f main.cf master.cf test40.tmp
+
printfck: $(OBJS) $(PROG)
rm -rf printfck
mkdir printfck
/* An application-level locking method. An application locks a file
/* named \fIfilename\fR by creating a file named \fIfilename\fB.lock\fR.
/* The application is expected to remove its own lock file, as well as
-/* stale lock files that were left behind after abnormal termination.
+/* stale lock files that were left behind after abnormal program
+/* termination.
/* .RE
/* .IP \fB-m\fR
/* List the names of all supported lookup table types. In Postfix
register_builtin_parameters(basename(argv[0]), getpid());
register_service_parameters();
register_user_parameters();
- show_master(cmd_mode, argv + optind);
+ show_master(VSTREAM_OUT, cmd_mode, argv + optind);
}
/*
/*
* Show the requested values.
*/
- show_parameters(cmd_mode, param_class, argv + optind);
+ show_parameters(VSTREAM_OUT, cmd_mode, param_class, argv + optind);
/*
* Flag unused parameters. This makes no sense with "postconf -d",
*/
extern void read_parameters(void);
extern void set_parameters(char **);
-extern void show_parameters(int, int, char **);
+extern void show_parameters(VSTREAM *, int, int, char **);
/*
* postconf_edit.c
/*
* postconf_master.c.
*/
+extern const char daemon_options_expecting_value[];
extern void read_master(int);
-extern void show_master(int, char **);
+extern void show_master(VSTREAM *, int, char **);
#define WARN_ON_OPEN_ERROR 0
#define FAIL_ON_OPEN_ERROR 1
/*
/* expand_parameter_value() expands $name in the specified
/* parameter value. This function ignores the SHOW_NONDEF flag.
-/* The result is in static memory that is overwritten with
-/* each call.
+/* The result value is a pointer to storage in a user-supplied
+/* buffer, or in a buffer that is overwritten with each call.
/*
/* Arguments:
/* .IP buf
-/* Null pointer, or pointer to output storage.
+/* Null buffer pointer, or pointer to user-supplied buffer.
/* .IP mode
/* Bit-wise OR of zero or one of the following (other flags
/* are ignored):
/* .IP SHOW_DEFS
/* Search built-in default parameter settings only.
/* .IP SHOW_NONDEF
-/* Search local (master.cf) or global (main.cf) name=value
+/* Search local (master.cf) and global (main.cf) name=value
/* parameter settings only.
/* .RE
/* .IP name
/* .IP value
/* The parameter value where $name should be expanded.
/* .IP local_scope
-/* Null pointer, or pointer to master.cf entry with local
-/* name=value settings.
+/* Pointer to master.cf entry with local name=value settings,
+/* or a null pointer (i.e. no local parameter lookup).
/* .IP node
-/* Null pointer, or global default setting for the named
-/* parameter.
+/* Global default value for the named parameter, or a null
+/* pointer (i.e. do the global default lookup anyway).
/* DIAGNOSTICS
/* Problems are reported to the standard error stream.
/* LICENSE
const char *value = 0;
/*
- * Use the actual or built-in default parameter value. Local name=value
- * entries in master.cf take precedence over global name=value entries in
- * main.cf. Built-in defaults have the lowest precedence.
+ * Local name=value entries in master.cf take precedence over global
+ * name=value entries in main.cf. Built-in defaults have the lowest
+ * precedence.
*/
if ((mode & SHOW_DEFS) != 0
|| ((local_scope == 0 || local_scope->all_params == 0
/*
/* void read_parameters()
/*
-/* void show_parameters(mode, param_class, names)
+/* void show_parameters(fp, mode, param_class, names)
+/* VSTREAM *fp;
/* int mode;
/* int param_class;
/* char **names;
/* 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
+/* show_parameters() writes main.cf parameters to the specified
/* output stream.
/*
/* Arguments:
+/* .IP fp
+/* Output stream.
/* .IP mode
/* Bit-wise OR of zero or more of the following:
/* .RS
/* print_line - show line possibly folded, and with normalized whitespace */
-static void print_line(int mode, const char *fmt,...)
+static void print_line(VSTREAM *fp, int mode, const char *fmt,...)
{
va_list ap;
static VSTRING *buf = 0;
*next++ = 0;
if (word_len > 0 && line_len > 0) {
if ((mode & FOLD_LINE) == 0 || line_len + word_len < LINE_LIMIT) {
- vstream_fputs(" ", VSTREAM_OUT);
+ vstream_fputs(" ", fp);
line_len += 1;
} else {
- vstream_fputs("\n" INDENT_TEXT, VSTREAM_OUT);
+ vstream_fputs("\n" INDENT_TEXT, fp);
line_len = INDENT_LEN;
}
}
- vstream_fputs(start, VSTREAM_OUT);
+ vstream_fputs(start, fp);
line_len += word_len;
}
- vstream_fputs("\n", VSTREAM_OUT);
+ vstream_fputs("\n", fp);
}
/* print_parameter - show specific parameter */
-static void print_parameter(int mode, const char *name,
+static void print_parameter(VSTREAM *fp, int mode, const char *name,
PC_PARAM_NODE *node)
{
const char *value;
value = expand_parameter_value((VSTRING *) 0, mode, value,
(PC_MASTER_ENT *) 0);
if (mode & SHOW_NAME) {
- print_line(mode, "%s = %s\n", name, value);
+ print_line(fp, mode, "%s = %s\n", name, value);
} else {
- print_line(mode, "%s\n", value);
+ print_line(fp, mode, "%s\n", value);
}
if (msg_verbose)
- vstream_fflush(VSTREAM_OUT);
+ vstream_fflush(fp);
}
}
/* show_parameters - show parameter info */
-void show_parameters(int mode, int param_class, char **names)
+void show_parameters(VSTREAM *fp, int mode, int param_class, char **names)
{
PC_PARAM_INFO **list;
PC_PARAM_INFO **ht;
qsort((char *) list, param_table->used, sizeof(*list), comp_names);
for (ht = list; *ht; ht++)
if (param_class & PC_PARAM_INFO_NODE(*ht)->flags)
- print_parameter(mode, PC_PARAM_INFO_NAME(*ht),
+ print_parameter(fp, mode, PC_PARAM_INFO_NAME(*ht),
PC_PARAM_INFO_NODE(*ht));
myfree((char *) list);
return;
if ((node = PC_PARAM_TABLE_FIND(param_table, *namep)) == 0) {
msg_warn("%s: unknown parameter", *namep);
} else {
- print_parameter(mode, *namep, node);
+ print_parameter(fp, mode, *namep, node);
}
}
}
/* SYNOPSIS
/* #include <postconf.h>
/*
+/* const char daemon_options_expecting_value[];
+/*
/* void read_master(fail_on_open)
/* int fail_on_open;
/*
-/* void show_master(mode, filters)
+/* void show_master(fp, mode, filters)
+/* VSTREAM *fp;
/* int mode;
/* char **filters;
/* DESCRIPTION
/* read_master() reads entries from master.cf into memory.
/*
/* show_master() writes the entries in the master.cf file
-/* to standard output.
+/* to the specified stream.
+/*
+/* daemon_options_expecting_value[] is an array of master.cf
+/* daemon command-line options that expect an option value.
/*
/* Arguments
/* .IP fail_on_open
/* Specify FAIL_ON_OPEN if open failure is a fatal error,
/* WARN_ON_OPEN if a warning should be logged instead.
+/* .IP fp
+/* Output stream.
/* .IP mode
/* If the FOLD_LINE flag is set, show_master() wraps long
/* output lines.
#include <postconf.h>
+const char daemon_options_expecting_value[] = "o";
+
#define STR(x) vstring_str(x)
/* normalize_options - bring options into canonical form */
{
int field;
char *arg;
+ char *cp;
+ char *junk;
/*
* Normalize options to simplify later processing.
arg = argv->argv[field];
if (arg[0] != '-' || strcmp(arg, "--") == 0)
break;
- if (strncmp(arg, "-o", 2) == 0) {
- if (arg[2] != 0) {
- /* Split "-oname=value" into "-o" "name=value". */
- argv_insert_one(argv, field + 1, arg + 2);
- argv_replace_one(argv, field, "-o");
- /* arg is now a dangling pointer. */
- field += 1;
- } else if (argv->argv[field + 1] != 0) {
- /* Already in "-o" "name=value" form. */
- field += 1;
+ for (cp = arg + 1; *cp; cp++) {
+ if (strchr(daemon_options_expecting_value, *cp) != 0
+ && cp > arg + 1) {
+ /* Split "-stuffo" into "-stuff" and "-o". */
+ junk = concatenate("-", cp, (char *) 0);
+ argv_insert_one(argv, field + 1, junk);
+ myfree(junk);
+ *cp = 0;
+ break;
}
}
+ if (strchr(daemon_options_expecting_value, arg[1]) == 0)
+ /* Option requires no value. */
+ continue;
+ if (arg[2] != 0) {
+ /* Split "-oname=value" into "-o" "name=value". */
+ argv_insert_one(argv, field + 1, arg + 2);
+ arg[2] = 0;
+ field += 1;
+ } else if (argv->argv[field + 1] != 0) {
+ /* Already in "-o" "name=value" form. */
+ field += 1;
+ }
}
}
/* print_master_line - print one master line */
-static void print_master_line(int mode, PC_MASTER_ENT *masterp)
+static void print_master_line(VSTREAM *fp, int mode, PC_MASTER_ENT *masterp)
{
char **argv = masterp->argv->argv;
const char *arg;
};
#define ADD_TEXT(text, len) do { \
- vstream_fputs(text, VSTREAM_OUT); line_len += len; } \
+ vstream_fputs(text, fp); line_len += len; } \
while (0)
#define ADD_SPACE ADD_TEXT(" ", 1)
/* Force line wrap. */
line_len = LINE_LIMIT;
}
- } else {
+ }
+
+ /*
+ * Special processing for options that require a value.
+ */
+ else if (strchr(daemon_options_expecting_value, arg[1]) != 0
+ && (aval = argv[field + 1]) != 0) {
/*
- * Process options with a value.
+ * Optionally, expand $name in parameter value.
*/
if (strcmp(arg, "-o") == 0
- && (aval = argv[field + 1]) != 0
&& (mode & SHOW_EVAL) != 0)
aval = expand_parameter_value((VSTRING *) 0, mode,
aval, masterp);
/*
* Keep option and value on the same line.
*/
- if (aval)
- arg_len += strlen(aval) + 1;
+ arg_len += strlen(aval) + 1;
}
}
|| line_len + 1 + arg_len < LINE_LIMIT) {
ADD_SPACE;
} else {
- vstream_fputs("\n" INDENT_TEXT, VSTREAM_OUT);
+ vstream_fputs("\n" INDENT_TEXT, fp);
line_len = INDENT_LEN;
}
}
field += 1;
}
}
- vstream_fputs("\n", VSTREAM_OUT);
+ vstream_fputs("\n", fp);
}
/* show_master - show master.cf entries */
-void show_master(int mode, char **filters)
+void show_master(VSTREAM *fp, int mode, char **filters)
{
PC_MASTER_ENT *masterp;
ARGV *service_filter = 0;
if ((service_filter == 0
|| match_service_match(service_filter, masterp->name_space))
&& ((mode & SHOW_NONDEF) == 0 || masterp->all_params != 0))
- print_master_line(mode, masterp);
+ print_master_line(fp, mode, masterp);
/*
* Cleanup.
*/
#define NO_SCAN_RESULT ((VSTRING *) 0)
#define NO_SCAN_FILTER ((char *) 0)
-#define NO_SCAN_MODE (0)
/* SCAN_USER_PARAMETER_VALUE - examine macro names in parameter value */
return (0);
}
-/* flag_user_parameter_wrapper - max_expand call-back helper */
+/* flag_user_parameter_wrapper - mac_expand call-back helper */
static const char *flag_user_parameter_wrapper(const char *mac_name,
int unused_mode,
PC_MASTER_ENT *masterp;
ARGV *argv;
char *arg;
+ char *aval;
int field;
char *saved_arg;
char *param_name;
arg = argv->argv[field];
if (arg[0] != '-' || strcmp(arg, "--") == 0)
break;
- if (strcmp(arg, "-o") == 0 && (arg = argv->argv[field + 1]) != 0) {
- saved_arg = mystrdup(arg);
+ if (strchr(daemon_options_expecting_value, arg[1]) == 0
+ || (aval = argv->argv[field + 1]) == 0)
+ continue;
+ if (strcmp(arg, "-o") == 0) {
+ saved_arg = mystrdup(aval);
if (split_nameval(saved_arg, ¶m_name, ¶m_value) == 0)
dict_update(masterp->name_space, param_name, param_value);
myfree(saved_arg);
- field += 1;
}
+ field += 1;
}
if ((dict = dict_handle(masterp->name_space)) != 0) {
masterp->all_params = dict;
--- /dev/null
+foo unix - n n - 0 other -v -o aaa=bbb -v
+ -o ccc=bbb -v -o ddd=bbb
projects / thirdparty / postfix.git / commitdiff
