head	1.3;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3
	OPENPKG_E1_FP:1.3
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3
	OPENPKG_2_STABLE_20060622:1.3
	OPENPKG_2_STABLE:1.3.0.14
	OPENPKG_2_STABLE_BP:1.3
	OPENPKG_2_5_RELEASE:1.3
	OPENPKG_2_5_SOLID:1.3.0.12
	OPENPKG_2_5_SOLID_BP:1.3
	OPENPKG_2_4_RELEASE:1.3
	OPENPKG_2_4_SOLID:1.3.0.10
	OPENPKG_2_4_SOLID_BP:1.3
	OPENPKG_CW_FP:1.3
	OPENPKG_2_3_RELEASE:1.3
	OPENPKG_2_3_SOLID:1.3.0.8
	OPENPKG_2_3_SOLID_BP:1.3
	OPENPKG_2_2_RELEASE:1.3
	OPENPKG_2_2_SOLID:1.3.0.6
	OPENPKG_2_2_SOLID_BP:1.3
	OPENPKG_2_1_RELEASE:1.3
	OPENPKG_2_1_SOLID:1.3.0.4
	OPENPKG_2_1_SOLID_BP:1.3
	OPENPKG_2_0_RELEASE:1.3
	OPENPKG_2_0_SOLID:1.3.0.2
	OPENPKG_2_0_SOLID_BP:1.3
	OPENPKG_1_3_RELEASE:1.1.2.2
	OPENPKG_1_3_SOLID:1.1.2.2.0.2
	OPENPKG_1_3_SOLID_BP:1.1.2.2
	OPENPKG_1_STABLE_MP:1.3
	OPENPKG_1_2_RELEASE:1.1
	OPENPKG_1_2_SOLID:1.1.0.4
	OPENPKG_1_2_SOLID_BP:1.1
	OPENPKG_1_STABLE:1.1.0.2
	OPENPKG_1_STABLE_BP:1.1;
locks; strict;
comment	@# @;


1.3
date	2003.02.19.12.53.06;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2003.02.19.10.04.07;	author thl;	state Exp;
branches;
next	1.1;

1.1
date	2002.12.19.10.57.26;	author rse;	state Exp;
branches
	1.1.2.1
	1.1.4.1;
next	;

1.1.2.1
date	2003.02.19.12.30.34;	author rse;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2003.07.24.20.50.04;	author rse;	state Exp;
branches;
next	;

1.1.4.1
date	2003.02.19.12.32.12;	author rse;	state Exp;
branches;
next	;


desc
@@


1.3
log
@allow plus-notation based email addresses, too
@
text
@--- approve.orig	1997-04-05 21:18:36.000000000 +0200
+++ approve	2002-12-19 11:56:05.000000000 +0100
@@@@ -214,6 +214,11 @@@@
 	    $from_skipped = 1;
 	    next;
 	}
+	elsif (/^Delivered-To: /i) {
+	    # Skip Develivered-To: headers on approval to avoid
+	    # bouncing of the approved message by MTAs like Postfix.
+	    next;
+	}
 	s/^~/~~/;
 	print MAIL $_;
     }
--- majordomo.orig      Mon Feb  3 13:23:45 2003
+++ majordomo   Mon Feb  3 13:23:23 2003
@@@@ -624,6 +624,11 @@@@
 
 sub do_which {
     local($subscriber) = join(" ", @@_) || &valid_addr($reply_to);
+    if ($subscriber !~ /^[0-9a-zA-Z\.\-\_]+(\+[0-9a-zA-Z\.\-\_]+)?\@@[0-9a-zA-Z\.\-]+\.[a-zA-Z]{2,3}$/) {
+       
+       &log("which abuse -> $subscriber passed as an argument.");
+       exit(0);
+       };
     local($count, $per_list_hits) = 0;
     # Tell the requestor which lists they are on by reading through all
     # the lists, comparing their address to each address from each list
@


1.2
log
@fix from http://www.securityfocus.com/bid/6761
@
text
@d21 1
a21 1
+    if ($subscriber !~ /^[0-9a-zA-Z\.\-\_]+\@@[0-9a-zA-Z\.\-]+\.[a-zA-Z]{2,3}$/) {
@


1.1
log
@solve bouncing problem related to Postfix
@
text
@d15 14
@


1.1.4.1
log
@MFS: majordomo security bugfix
@
text
@a14 14
--- majordomo.orig      Mon Feb  3 13:23:45 2003
+++ majordomo   Mon Feb  3 13:23:23 2003
@@@@ -624,6 +624,11 @@@@
 
 sub do_which {
     local($subscriber) = join(" ", @@_) || &valid_addr($reply_to);
+    if ($subscriber !~ /^[0-9a-zA-Z\.\-\_]+\@@[0-9a-zA-Z\.\-]+\.[a-zA-Z]{2,3}$/) {
+       
+       &log("which abuse -> $subscriber passed as an argument.");
+       exit(0);
+       };
     local($count, $per_list_hits) = 0;
     # Tell the requestor which lists they are on by reading through all
     # the lists, comparing their address to each address from each list
@


1.1.2.1
log
@MFC: majordomo security bugfix
@
text
@a14 14
--- majordomo.orig      Mon Feb  3 13:23:45 2003
+++ majordomo   Mon Feb  3 13:23:23 2003
@@@@ -624,6 +624,11 @@@@
 
 sub do_which {
     local($subscriber) = join(" ", @@_) || &valid_addr($reply_to);
+    if ($subscriber !~ /^[0-9a-zA-Z\.\-\_]+\@@[0-9a-zA-Z\.\-]+\.[a-zA-Z]{2,3}$/) {
+       
+       &log("which abuse -> $subscriber passed as an argument.");
+       exit(0);
+       };
     local($count, $per_list_hits) = 0;
     # Tell the requestor which lists they are on by reading through all
     # the lists, comparing their address to each address from each list
@


1.1.2.2
log
@mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only]
@
text
@d21 1
a21 1
+    if ($subscriber !~ /^[0-9a-zA-Z\.\-\_]+(\+[0-9a-zA-Z\.\-\_]+)?\@@[0-9a-zA-Z\.\-]+\.[a-zA-Z]{2,3}$/) {
@