*** majordomo.old	Wed Aug 27 10:55:29 1997
--- majordomo	Thu Dec 11 00:16:31 1997
***************
*** 27,29 ****
  # Read and execute the .cf file
! $cf = $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf"; 
  
--- 27,29 ----
  # Read and execute the .cf file
! $cf = $ENV{"MAJORDOMO_CF"} || "/var/majordomo/majordomo.cf"; 
  
***************
*** 277,281 ****
  	      # message if strip = yes.
! 	      if (&cf_ck_bool($clean_list,"strip")) {
  		  $subscriber = (&ParseAddrs($subscriber))[0];
! 	      }
  	      &send_confirm("subscribe", $clean_list, $subscriber);
--- 277,281 ----
  	      # message if strip = yes.
! #	      if (&cf_ck_bool($clean_list,"strip")) {
  		  $subscriber = (&ParseAddrs($subscriber))[0];
! #	      }
  	      &send_confirm("subscribe", $clean_list, $subscriber);
***************
*** 307,309 ****
  	    } else {
! 		if ( &cf_ck_bool($clean_list,"strip") ) {
  		    print LIST &valid_addr($subscriber), "\n" ||
--- 307,314 ----
  	    } else {
! #		if ( &cf_ck_bool($clean_list,"strip") ) {
!                     $withoutamp = &valid_addr($subscriber);
!                     if (substr($withoutamp, 0, 1) !~ /[A-Za-z0-9]/) {
!                         print LIST "&" ||
!                         &abort("Error writing $listdir/$clean_list: $!");
!                     }                        
  		    print LIST &valid_addr($subscriber), "\n" ||
***************
*** 310,315 ****
  			&abort("Error writing $listdir/$clean_list: $!");
! 		} else {
! 		    print LIST $subscriber, "\n" ||
! 			&abort("Error writing $listdir/$clean_list: $!");
! 		}
  		if (defined $deflist) {
--- 315,320 ----
  			&abort("Error writing $listdir/$clean_list: $!");
! #		} else {
! #		    print LIST $subscriber, "\n" ||
! #			&abort("Error writing $listdir/$clean_list: $!");
! #		}
  		if (defined $deflist) {
***************
*** 323,325 ****
  		# a notice of the new subscriber to the list owner
! 		if ( &cf_ck_bool($clean_list,"strip") ) {
  		    local($clean_sub) = &valid_addr($subscriber);
--- 328,331 ----
  		# a notice of the new subscriber to the list owner
! #		if ( &cf_ck_bool($clean_list,"strip") ) {
! 		if (1) {
  		    local($clean_sub) = &valid_addr($subscriber);
***************
*** 326,330 ****
  		    &welcome($clean_list, $clean_sub);
- 		} else {
- 		    &welcome($clean_list, $subscriber);
  		}
  	    }
--- 332,337 ----
  		    &welcome($clean_list, $clean_sub);
  		}
+ #		} else {
+ #		    &welcome($clean_list, $subscriber);
+ #		}
  	    }
***************
*** 645,647 ****
  	    &abort("Can't open list $listdir/$list");
! 	while (<LIST>) {
  
--- 652,654 ----
  	    &abort("Can't open list $listdir/$list");
! 	while ($withamp = <LIST>) {
  
***************
*** 654,657 ****
  
! 	    $_ = &chop_nl($_);
! 	    if (&addr_match($_, $subscriber, 1)) {
  		if ($count == 0) {
--- 661,664 ----
  
! 	    $withamp = &chop_nl($withamp);
! 	    if (&addr_match($withamp, $subscriber, 1)) {
  		if ($count == 0) {
***************
*** 660,662 ****
  		}
! 		printf REPLY "%-23s %s\n", $list, $_;
  		$count++;
--- 667,672 ----
  		}
! 		if (substr($withamp, 0, 1) eq "&") {
! 		    $withamp = substr($withamp, 1, length($withamp) - 1);
! 		}
! 		printf REPLY "%-23s %s\n", $list, $withamp;
  		$count++;
***************
*** 714,717 ****
  	if (&lopen(LIST, "", "$listdir/$clean_list")) {
! 	    while (<LIST>) {
! 		print REPLY $_;
  		$counter++;
--- 724,730 ----
  	if (&lopen(LIST, "", "$listdir/$clean_list")) {
! 	    while ($withamp = <LIST>) {
! 		if (substr($withamp, 0, 1) eq "&") {
! 		    $withamp = substr($withamp, 1, length($withamp) - 1);
! 		}
! 		print REPLY $withamp;
  		$counter++;