Please combine this into the previous patch.  Actually, I applied it
anyway, see below.

These patch dumps are really hard to deal with.  They often contain
multiple overlapping patches all dealing with similar things.  Also, not
all the patches are making it through.  In the recent set [PATCH 2/13] is
missing (I double checked the list archive).

There's definitely a sweet spot between big commits and small commits, that
we need to find... but with the very limited time I have to apply things...
I think that larger (but still focused) commits are a little easier.

Anyway,
 I've gone through most of the patches and applied most things that just
worked from mutt with git am.  The ones that didn't get applied most likely
wouldn't, and I didn't have time to figure out why.  Likely an ordering
issue.

I don't want to discourage you from sending patches -- this is the most
interest anyone has had in qpsmtpd in a while, and we definitely appreciate
it.

-R


On Fri, May 18, 2012 at 6:23 PM, Matt Simerson <m...@tnpi.net> wrote:

> spell deferr correctly
> add name of deprecated config name to error message
> ---
>  plugins/check_basicheaders |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/plugins/check_basicheaders b/plugins/check_basicheaders
> index 6ca2056..70f765f 100644
> --- a/plugins/check_basicheaders
> +++ b/plugins/check_basicheaders
> @@ -51,7 +51,7 @@ Whether to issue a permanent or temporary rejection. The
> default is permanent.
>
>   check_basicheaders reject_type [ temp | perm ]
>
> -Using a temporary rejection is a cautious way to enable rejections. It
> allows an administrator to watch for a trial period and assure no valid
> messages are rejected. If a deferral of valid mail is noticed, I<reject 0>
> can be set to permit the deffered message to be delivered.
> +Using a temporary rejection is a cautious way to enable rejections. It
> allows an administrator to watch for a trial period and assure no valid
> messages are rejected. If a deferral of valid mail is noticed, I<reject 0>
> can be set to permit the deferred message to be delivered.
>
>  Default policy is a permanent rejection.
>
> @@ -94,7 +94,7 @@ sub register {
>     };
>  # provide backwards comptibility with the old 'days' argument
>     if ( $self->{_args}{days} ) {
> -        $self->log(LOGWARN, "deprecated arguments. Update your config.");
> +        $self->log(LOGWARN, "deprecated argument 'days', update your
> config.");
>         if ( ! defined $self->{_args}{future} ) {
>             $self->{_args}{future} = $self->{_args}{days};
>         };
> --
> 1.7.9.6
>
>

Reply via email to