Item13936: Use site email addresses in the server probe

Using example.com, even though we don't actually send an email causes some email servers to reject the coneection by relaying denied.
foswiki · Nov 12, 2016 · 68e18fa · 68e18fa
1 parent ddb5ecf
commit 68e18fa
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/core/lib/Foswiki/Configure/Wizards/AutoConfigureEmail.pm b/core/lib/Foswiki/Configure/Wizards/AutoConfigureEmail.pm
@@ -1341,8 +1341,9 @@ sub testServer {
     # authentication is not required.
     # The session is reset so no mail is actually sent.
 
-    my ( $fromTestAddr, $toTestAddr ) =
-      (qw/postmaster@example.net postmaster@example.com/);
+    my $fromTestAddr = $Foswiki::cfg{Email}{WikiAgentEmail}
+      || $Foswiki::cfg{WebMasterEmail};
+    my $toTestAddr = $Foswiki::cfg{WebMasterEmail};
     my ( @code, $requires );
 
     my $noAuthOk = $smtp->mail($fromTestAddr) && $smtp->to($toTestAddr);