Item12180: Trap exec warnings when no SELinux

git-svn-id: http://svn.foswiki.org/trunk@16200 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Dec 13, 2012 · 69d8238 · 69d8238
1 parent a1d44c4
commit 69d8238
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/core/lib/Foswiki/Configure/Checkers/EnableEmail.pm b/core/lib/Foswiki/Configure/Checkers/EnableEmail.pm
@@ -236,6 +236,7 @@ sub autoconfigProgram {
                   . " and Net::SMTP configuration failed.  Please correct the Net::SMTP parameters, or configure a mail program manually."
               )
               . $scroll
+              . $this->FB_VALUE( '{Email}{MailMethod}', 'Net::SMTP' )
         );
     }
     if ( $seen && $perlAvail ) {
@@ -257,6 +258,7 @@ sub autoconfigProgram {
               . ". and Net::SMTP configuration failed.  Please correct the Net::SMTP parameters, or install a mail program."
           )
           . $scroll
+          . $this->FB_VALUE( '{Email}{MailMethod}', 'Net::SMTP' )
     );
 }
 
@@ -287,10 +289,15 @@ sub mailwrapperConfig {
 sub diagnoseFailure {
     my ( $noconnect, $allconnect ) = @_;
 
-    my $selStatus = system("selinuxenabled");
-    my $blameSEL  = 1
-      unless ( $selStatus == -1
-        || ( ( $selStatus >> 8 ) && !( $selStatus & 127 ) ) );
+    my $blameSEL;
+    {
+        no warnings 'exec';
+
+        my $selStatus = system("selinuxenabled");
+        $blameSEL = 1
+          unless ( $selStatus == -1
+            || ( ( $selStatus >> 8 ) && !( $selStatus & 127 ) ) );
+    }
 
     my $e .= << "SELINUX";
 <strong>Note:</strong> SELinux appears to be enabled on your system.