Changeset 2242

Show
Ignore:
Timestamp:
08/31/08 09:45:23 (3 months ago)
Author:
mbr
Message:

Applied patch from Franck Joncourt to fix missing check for the 'mail' command

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • psad/trunk/CREDITS

    r2238 r2242  
    391391      architecture for bundling the cipherdyne.org projects for Debian. 
    392392    - Submitted patches for documentation fixes in various psad man pages. 
     393    - Submitted patch to fix missing check against the 'mail' command for the 
     394      fwcheck_psad.pl script. 
    393395 
    394396Erik Heidt 

  • psad/trunk/fwcheck_psad.pl

    r2026 r2242  
    494494        ### required if DShield alerting is enabled and a DShield user 
    495495        ### email is set. 
    496         next if $cmd =~ /mail/i; 
     496        if ($cmd eq 'mail') { 
     497            next CMD if $config{'ALERTING_METHODS'} =~ /no.?e?mail/i; 
     498        } elsif ($cmd eq 'sendmail') { 
     499            next CMD unless ($config{'ENABLE_DSHIELD_ALERTS'} eq 'Y' 
     500                and $config{'DSHIELD_ALERT_EMAIL'} ne 'NONE'); 
     501        } 
     502 
    497503        next if $cmd eq 'wget';  ### only used in --sig-update mode 
    498504        unless (-x $cmds{$cmd}) {