[svn:qpsmtpd] r687 - contrib/hjp/aliases

Author: hjp
Date: Sat Dec 16 02:27:48 2006
New Revision: 687

Modified:
   contrib/hjp/aliases/Makefile
   contrib/hjp/aliases/aliases_check
   contrib/hjp/aliases/aliases_rewrite
   contrib/hjp/aliases/qpsmtpd-plugin-aliases.spec

Log:
Optionally log expansion of recipient address.


Modified: contrib/hjp/aliases/Makefile
==============================================================================
--- contrib/hjp/aliases/Makefile	(original)
+++ contrib/hjp/aliases/Makefile	Sat Dec 16 02:27:48 2006
@@ -1,4 +1,9 @@
 PKG = qpsmtpd-plugin-aliases
+FILES = $(PKG).spec aliases_check aliases_rewrite Makefile TODO
+CONTRIB_BASE=~/wrk/qpsmtpd/contrib/hjp
+CONTRIB_FILES=$(patsubst %, $(CONTRIB_BASE)/aliases/%, $(FILES))
+
+
 all:
 
 rpm: $(PKG).tar.gz
@@ -6,3 +11,8 @@
 
 $(PKG).tar.gz: $(PKG).spec aliases_check aliases_rewrite
 	tar cfz $@ $^
+
+contrib: $(CONTRIB_FILES)
+
+$(CONTRIB_BASE)/aliases/%: %
+	cp -p $^ $@

Modified: contrib/hjp/aliases/aliases_check
==============================================================================
--- contrib/hjp/aliases/aliases_check	(original)
+++ contrib/hjp/aliases/aliases_check	Sat Dec 16 02:27:48 2006
@@ -133,6 +133,8 @@
         ...
     }
 
+=back
+
 =cut
 
 use strict;
@@ -241,8 +243,16 @@
 
 
 sub register {
-    my ($self, $qp) = @_;
+    my ($self, $qp, @args) = @_;
     $self->log(LOGDEBUG, "register called on $self");
+    %{$self->{_args}} = @args;
+
+    if (defined $self->{_args}{log_expn}) {
+	$self->{_args}{log_expn} = log_level($self->{_args}{log_expn}) 
+	    unless $self->{_args}{log_expn} =~ m/^\d+$/;
+    } else {
+	$self->{_args}{log_expn} = LOGDEBUG;
+    }
 
     $self->register_hook("rcpt", "check_rcpt");
     $self->register_hook("pre-connection", "pre_connection");
@@ -261,7 +271,7 @@
 
 }
 
-# expand the given alias, returnung a hashref of mailaddresses.
+# expand the given alias, returnung an arrayref of mailaddresses.
 #
 # $detail is a detail string which is inserted into every expanded
 # mail address.
@@ -408,6 +418,7 @@
     $exprcpt->{$orig} = $e;
     $transaction->notes('expanded_recipients', $exprcpt);
     $transaction->notes('recipient_options', $self->alias_options($rcpt));
+    $self->log($self->{_args}{log_expn}, "expn: $orig -> @$e");
     return (DECLINED, "");
 }
 

Modified: contrib/hjp/aliases/aliases_rewrite
==============================================================================
--- contrib/hjp/aliases/aliases_rewrite	(original)
+++ contrib/hjp/aliases/aliases_rewrite	Sat Dec 16 02:27:48 2006
@@ -48,6 +48,8 @@
         ...
     }
 
+=back
+
 =cut
 
 use strict;

Modified: contrib/hjp/aliases/qpsmtpd-plugin-aliases.spec
==============================================================================
--- contrib/hjp/aliases/qpsmtpd-plugin-aliases.spec	(original)
+++ contrib/hjp/aliases/qpsmtpd-plugin-aliases.spec	Sat Dec 16 02:27:48 2006
@@ -1,5 +1,5 @@
 Name: qpsmtpd-plugin-aliases
-Version: 181
+Version: 200
 Release: 1
 Packager: [email protected]
 Summary: aliases plugin for qpsmtpd
@@ -40,6 +40,9 @@
 /usr/share/qpsmtpd/plugins/aliases_rewrite
 
 %changelog
+* Mon Aug 14 2006 <[email protected]> 200-1
+- Upstream version 200: Optionally log expansion of recipient address.
+
 * Wed Apr 19 2006 <[email protected]> 181-1
 - Upstream version 180: Honor the connection->relay_client property.
 - Upstream version 181: Updated spec file.