cvs commit: qpsmtpd/plugins/queue qmail-queue

cvsuser     03/08/30 08:13:04

  Modified:    config   plugins
               plugins/queue qmail-queue
  Log:
    Use $ENV{QMAIL} to override /var/qmail for where to find the
    control/ directory.
  
    Enable "check_earlytalker" in the default plugins config
  
  Revision  Changes    Path
  1.9       +3 -1      qpsmtpd/config/plugins
  
  Index: plugins
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/config/plugins,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -w -r1.8 -r1.9
  --- plugins	15 Apr 2003 17:38:45 -0000	1.8
  +++ plugins	30 Aug 2003 15:13:04 -0000	1.9
  @@ -8,7 +8,7 @@
   
   quit_fortune
   
  -#check_earlytalker
  +check_earlytalker
   count_unrecognized_commands 4
   
   require_resolvable_fromhost
  @@ -18,6 +18,8 @@
   check_badmailfrom
   check_badrcptto
   check_spamhelo
  +
  +# sender_permitted_from
   
   # this plugin needs to run after all other "rcpt" plugins
   check_relay
  
  
  
  1.4       +3 -4      qpsmtpd/plugins/queue/qmail-queue
  
  Index: qmail-queue
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/plugins/queue/qmail-queue,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- qmail-queue	16 Apr 2003 16:45:57 -0000	1.3
  +++ qmail-queue	30 Aug 2003 15:13:04 -0000	1.4
  @@ -16,7 +16,6 @@
   
   If set the environment variable QMAILQUEUE overrides this setting.
   
  -
   =cut
   
   sub register {
  @@ -26,12 +25,12 @@
     if (@args > 0) {
       $self->{_queue_exec} = $args[0];
       $self->log(1, "WARNING: Ignoring additional arguments.") if (@args > 1);
  -  } else {
  -    $self->{_queue_exec} = "/var/qmail/bin/qmail-queue";
  +  }
  +  else {
  +    $self->{_queue_exec} = ($ENV{QMAIL} || '/var/qmail') . "/bin/qmail-queue";
     }
   
     $self->{_queue_exec} = $ENV{QMAILQUEUE} if $ENV{QMAILQUEUE};
  -
   }
   
   sub queue_handler {