Changeset 763

Show
Ignore:
Timestamp:
05/04/06 14:59:26 (4 years ago)
Author:
shibuya
Message:

modify forward.pl to fix the .forward issue with cmu by C. Hemsing.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 5100R/branches/DEV_OpenRaQ/ui/base-email.mod/Makefile

    r747 r763  
    88 
    99VERSION=1.2.0 
    10 RELEASE=92BQ20 
     10RELEASE=92BQ21 
    1111 
    1212# add a buildarch if desired 

  • 5100R/branches/DEV_OpenRaQ/ui/base-email.mod/glue/handlers/forward.pl

    r259 r763  
    3131} else { 
    3232        for my $forward (CCE->scalar_to_array($mail->{forwardEmail})) { 
    33                 if(&valid_forward($forward)) { 
    34                         $data .= "$forward\n"; 
    35                 } else { 
    36                         $bad_local_users ? ($bad_local_users .= ", $forward") : ($bad_local_users .= $forward); 
    37                 }        
     33                $data .= "$forward\n"; 
    3834        } 
    3935} 
    …… 
    6056$cce->bye("SUCCESS"); 
    6157exit(0); 
    62  
    63 sub valid_forward { 
    64         my $forward = shift; 
    65  
    66         # check for fully qualified email address 
    67         if ($forward =~ /^[\w\-\_\.]+\@[\w\-\_\.]+$/) { 
    68                 return 1; 
    69         } 
    70  
    71         # check if a the forward is a valid local user name 
    72         if (not getpwnam($forward)) { 
    73                 return 0; 
    74         } 
    75  
    76         return 1; 
    77 } 
    7858# Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved. 
    7959#  

  • 5100R/branches/DEV_OpenRaQ/ui/base-email.mod/templates/rpmdefs.tmpl

    r747 r763  
    108108 
    109109<begin $CHANGELOG> 
     110* Thu May 04 2006 Hisao SHIBUYA <shibuya@alpha.or.jp> 1.2.0-92BQ21 
     111- modify forward.pl to fix the .forward issue with cmu by C. Hemsing. 
     112 
    110113* Tue Apr 18 2006 Hisao SHIBUYA <shibuya@alpha.or.jp> 1.2.0-92BQ20 
    111114- modify validate_alias.pl to remove 'amanda' alias from the reserved list by Brian.