patch-lib_MailScanner_CustomConfig_pm 902 B

12345678910111213141516171819202122
  1. $OpenBSD: patch-lib_MailScanner_CustomConfig_pm,v 1.5 2015/04/09 19:55:09 sthen Exp $
  2. --- lib/MailScanner/CustomConfig.pm.orig Sun Mar 1 23:13:10 2015
  3. +++ lib/MailScanner/CustomConfig.pm Sun Mar 15 13:52:19 2015
  4. @@ -765,7 +765,7 @@ my($hostname);
  5. my $ConfFile = $ARGV[0];
  6. $ConfFile = $ARGV[1] if $ConfFile =~ /^-+/i;
  7. -$ConfFile = '/opt/MailScanner/etc/MailScanner.conf' unless $ConfFile && -f $ConfFile;
  8. +$ConfFile = '%SYSCONFDIR%/MailScanner/MailScanner.conf' unless $ConfFile && -f $ConfFile;
  9. my ($AccessDB, $Refusal, $my_mta); # Generalized here for Multiple MTA support
  10. $my_mta = lc(MailScanner::Config::QuickPeek($ConfFile, 'mta')) if $ConfFile &&
  11. @@ -1675,7 +1675,7 @@ __DATA__
  12. # SO17 1BJ
  13. # United Kingdom
  14. #
  15. -push @INC,"/usr/share/MailScanner","/opt/MailScanner/lib";
  16. +push @INC,"%PREFIX%/lib/MailScanner";
  17. use FileHandle;
  18. use Fcntl qw(:DEFAULT :flock);
  19. use Sys::Syslog;