Viktor Dukhovni:
> On Sat, Sep 27, 2014 at 02:51:37PM -0400, Wietse Venema wrote:
>
> > > In other respects, is the rest of the patch sound (correct and
> > > useful)? I am not advocating that the patch be adopted, just using
> >
> > postconf does not suppress parameters based on string comparison.
> > Instead, suppression is based on the origin of their definition.
> >
> > Making config_directory behavior different in this respect would
> > be a mistake.
>
> Yes, got that, so with the string comparison eliminated, is the
> rest of it a feature or a bug?
With this patch, which is smaller than the previous version, the
"postconf -n" command produces no "config_directory" output unless
a "config_directory" override is given with MAIL_CONFIG, -c or -o.
In my view the config_directory behavior is consistent with the
rest of Postfix. What are you referring to with "the rest of it"?
Wietse
> diff --git a/src/postconf/postconf_misc.c b/src/postconf/postconf_misc.c
> index af55d14..0107651 100644
> --- a/src/postconf/postconf_misc.c
> +++ b/src/postconf/postconf_misc.c
> @@ -51,7 +51,10 @@ void pcf_set_config_dir(void)
>
> if (var_config_dir)
> myfree(var_config_dir);
> - var_config_dir = mystrdup((config_dir = safe_getenv(CONF_ENV_PATH)) != 0
> ?
> - config_dir : DEF_CONFIG_DIR); /* XXX */
> - set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir);
> + if ((config_dir = safe_getenv(CONF_ENV_PATH)) != 0) {
> + var_config_dir = mystrdup(config_dir);
> + set_mail_conf_str(VAR_CONFIG_DIR, var_config_dir);
> + } else {
> + var_config_dir = mystrdup(DEF_CONFIG_DIR);
> + }
> }
>
> --
> Viktor.
>
