| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106 |
- $OpenBSD: patch-spampd,v 1.3 2014/11/27 12:37:29 ajacoutot Exp $
- https://github.com/mpaperno/spampd/commit/1fe20e4c0f06760eb341b519c32954bfc9ef7a15
- https://github.com/mpaperno/spampd/commit/9088ae52b6fc6dcf4bc1b2d19109166b4f76c66a
- https://github.com/mpaperno/spampd/commit/7706c364d19f630ba7fbc8681f6e75282d60a73f
- https://github.com/mpaperno/spampd/commit/e472b7b8f39f69ec20c81eaaf42c7fbfb9c703dd
- --- spampd.orig Wed Nov 26 09:56:25 2014
- +++ spampd Wed Nov 26 09:56:09 2014
- @@ -752,8 +752,8 @@ my $childtimeout = 6*60; # child process per-command t
- my $satimeout = 285; # SpamAssassin timeout in seconds (15s less than Postfix
- # default for smtp_data_done_timeout)
- my $pidfile = '/var/run/spampd.pid'; # write pid to file
- -my $user = 'mail'; # user to run as
- -my $group = 'mail'; # group to run as
- +my $user = '_spampd'; # user to run as
- +my $group = '_spampd'; # group to run as
- my $tagall = 0; # mark-up all msgs with SA, not just spam
- my $maxsize = 64; # max. msg size to scan with SA, in KB.
- my $rh = 0; # log which rules were hit
- @@ -824,6 +824,20 @@ if ( $logsock !~ /^(unix|inet)$/ ) {
- usage(0);
- }
-
- +# Untaint some options provided by admin command line.
- +$logsock = $1 if $logsock =~ /^(.*)$/;
- +
- +$pidfile = $1 if $pidfile =~ /^(.*)$/;
- +
- +$relayhost = $1 if $relayhost =~ /^(.*)$/;
- +
- +$relayport = $1 if $relayport =~ /^(.*)$/;
- +
- +$host = $1 if $host =~ /^(.*)$/;
- +
- +$port = $1 if $port =~ /^(.*)$/;
- +#
- +
- if ( $options{tagall} ) { $tagall = 1; }
- if ( $options{'log-rules-hit'} ) { $rh = 1; }
- if ( $options{debug} ) { $debug = 1; $nsloglevel = 4; }
- @@ -849,6 +863,7 @@ if ( $tmp[1] ) { $port = $tmp[1]; }
- my $assassin = Mail::SpamAssassin->new({
- 'dont_copy_prefs' => 1,
- 'debug' => $debug,
- + 'user_dir' => (getpwnam($user))[7],
- 'local_tests_only' => $options{'local-only'} || 0 });
-
- $options{'auto-whitelist'} and eval {
- @@ -942,9 +957,9 @@ Options:
- --pid=filename Store the daemon's process ID in this file.
- Default is /var/run/spampd.pid
- --user=username Specifies the user that the daemon runs as.
- - Default is mail.
- + Default is _spampd.
- --group=groupname Specifies the group that the daemon runs as.
- - Default is mail.
- + Default is _spampd.
- --nodetach Don't detach from the console and fork into
- background. Useful for some daemon control
- tools or when running as a win32 service
- @@ -1075,10 +1090,10 @@ L<http://www.WorldDesign.com/index.cfm/rd/mta/spampd.h
-
- =head1 Requires
-
- -=over 5
- -
- Perl modules:
-
- +=over 5
- +
- =item B<Mail::SpamAssassin>
-
- =item B<Net::Server::PreForkSimple>
- @@ -1249,7 +1264,7 @@ alternate to using the above --relayhost=ip:port notat
- =item B<--group=groupname> or B<--g=groupname>
-
- Specifies the user and group that the proxy will run as. Default is
- -I<mail>/I<mail>.
- +I<_spampd>/I<_spampd>.
-
- =item B<--children=n> or B<--c=n>
-
- @@ -1299,7 +1314,7 @@ Default is 285 seconds.
-
- Specifies a filename where I<spampd> will write its process ID so
- that it is easy to kill it later. The directory that will contain this
- -file must be writable by the I<spampd> user. The default is
- +file must be writable by the I<_spampd> user. The default is
- F</var/run/spampd.pid>.
-
- =item B<--logsock=unix or inet> C<(new in v2.20)>
- @@ -1390,10 +1405,10 @@ Prints usage information.
-
- =head2 Deprecated Options
-
- -=over 5
- -
- The following options are no longer used but still accepted for backwards
- compatibility with prevoius I<spampd> versions:
- +
- +=over 5
-
- =item B<--dead-letters>
-
|
