From 23f06fde7ac83e3ed30b3ba7c0333cf691c82c91 Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Wed, 23 May 2012 17:56:06 -0400 Subject: [PATCH] basicheaders: removed deprecated argument warning --- UPGRADING | 5 ----- plugins/check_basicheaders | 12 +----------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/UPGRADING b/UPGRADING index 207b5ac..7a3b478 100644 --- a/UPGRADING +++ b/UPGRADING @@ -3,11 +3,6 @@ When upgrading from: v 0.84 or below -CHECK_BASICHEADERS: - - Deprecated 'days' option in favor of past/future. See 'perldoc plugins/check_basicheaders'. - - CHECK_RELAY, CHECK_NORELAY, RELAY_ONLY All 3 plugins are deprecated and replaced with a new 'relay' plugin. The new plugin reads the same config files (see 'perldoc plugins/relay') as the previous plugins. To get the equivalent functionality of enabling 'relay_only', use the 'only' argument to the relay plugin as documented in the RELAY ONLY section of plugins/relay. diff --git a/plugins/check_basicheaders b/plugins/check_basicheaders index 889fac0..684b9a4 100644 --- a/plugins/check_basicheaders +++ b/plugins/check_basicheaders @@ -31,14 +31,6 @@ I would be surprised if a valid message ever had a date header older than a week check_basicheaders [ past 5 ] -=head2 days - -Deprecated. Use I and I instead. - -The number of days in the future or past beyond which messages are invalid. - - check_basicheaders [ days 3 ] - =head2 reject Determine if the connection is denied. Use the I option when first enabling the plugin, and then watch your logs to see what would have been rejected. When you are no longer concerned that valid messages will be rejected, enable with I. @@ -85,7 +77,6 @@ sub register { my ($self, $qp, @args) = @_; if ( @args == 1 ) { - $self->log(LOGWARN, "deprecated arguments. Update your config."); $self->{_args}{days} = $args[0]; } elsif ( @args % 2 ) { @@ -94,9 +85,8 @@ sub register { else { $self->{_args} = { @args }; }; -# provide backwards comptibility with the old 'days' argument +# provide backwards comptibility with the previous unnamed 'days' argument if ( $self->{_args}{days} ) { - $self->log(LOGWARN, "deprecated argument 'days', update your config."); if ( ! defined $self->{_args}{future} ) { $self->{_args}{future} = $self->{_args}{days}; };