Original release 20150826

[fex.git] / install

diff --git a/install b/install
index a34adf1bc53f977ca81870595048c18e8aabb16c..6f0bb62a6e556f1cbf05ec1b357c41e398e1f2fe 100755 (executable)
--- a/install
+++ b/install
@@ -7,6 +7,8 @@ use Socket;
 use IO::Socket::INET;
 use Digest::MD5        'md5_hex';
 
 use IO::Socket::INET;
 use Digest::MD5        'md5_hex';
 

+our (@local_rdomains,@local_rhosts);
+

 $ENV{PATH} .= ':/sbin:/usr/sbin';
 
 $usage = "usage: $0 [-p port] [IP-address]\n";
 $ENV{PATH} .= ':/sbin:/usr/sbin';
 
 $usage = "usage: $0 [-p port] [IP-address]\n";


@@ -391,12 +393,12 @@ unless (-f $xinetd) {
 
 if (@local_rdomains and not @local_rhosts) {
   print "\nWARNING:\n";
 
 if (@local_rdomains and not @local_rhosts) {
   print "\nWARNING:\n";

-  print "In $fph you have @local_rdomains but not @local_rhosts!\n";
+  print "In $fph you have \@local_rdomains but not \@local_rhosts!\n";

   print "Selfregistrating of external users will not work!\n";
   print "See ${fph}_new/\n";
 }
 
   print "Selfregistrating of external users will not work!\n";
   print "See ${fph}_new/\n";
 }
 

-if (`$sendmail -h 2>&1` =~ /exim/ and 
+if (`$sendmail -h 2>&1 </dev/null` =~ /exim/ and 

     `grep trusted_users /etc/exim4/exim4.conf 2>/dev/null` !~ /\bfex\b/) {
   print "\nWARNING:\n";
   print "$sendmail is exim\n";
     `grep trusted_users /etc/exim4/exim4.conf 2>/dev/null` !~ /\bfex\b/) {
   print "\nWARNING:\n";
   print "$sendmail is exim\n";