diff --git a/Anvil/Tools.pm b/Anvil/Tools.pm index ea7a3748..5c37da87 100644 --- a/Anvil/Tools.pm +++ b/Anvil/Tools.pm @@ -716,6 +716,23 @@ sub _anvil_version return($anvil->{HOST}{ANVIL_VERSION}); } +=head3 _domain_name + +This returns the domain name portion of the systen's host name. That is to say, the host name after the first '.'. If there is no domain portion, nothing is returned. + +=cut +sub _domain_name +{ + my $self = shift; + my $anvil = $self; + + my $domain_name = $anvil->_host_name; + $domain_name =~ s/^.*?\.//; + $domain_name = "" if not defined $domain_name; + + return($domain_name); +} + =head2 _host_name This returns the (full) host name for the machine this is running on. diff --git a/Anvil/Tools/Database.pm b/Anvil/Tools/Database.pm index 52da00bf..3d58b782 100644 --- a/Anvil/Tools/Database.pm +++ b/Anvil/Tools/Database.pm @@ -4443,6 +4443,328 @@ WHERE } +=head2 insert_or_update_mail_servers + +This updates (or inserts) a record in the 'mail_servers' table. The C<< mail_server_uuid >> referencing the database row will be returned. + +If there is an error, an empty string is returned. + +Parameters; + +=head3 delete (optional, default '0') + +If set to C<< 1 >>, the associated mail server will be deleted. Specifically, the C<< mail_server_helo_domain >> is set to C<< DELETED >>. + +When this is set, either C<< mail_server_uuid >> or C<< mail_server_address >> is required. + +=head3 uuid (optional) + +If set, only the corresponding database will be written to. + +=head3 file (optional) + +If set, this is the file name logged as the source of any INSERTs or UPDATEs. + +=head3 line (optional) + +If set, this is the file line number logged as the source of any INSERTs or UPDATEs. + +=head3 mail_server_address (required) + +This is the domain name or IP address of the mail server that alert emails will be forwarded to. + +=head3 mail_server_authentication (optional, default 'normal_password') + +This is the authentication method used to pass our password (or otherwise prove our identity) to the target mail server. + +This can be set to anything you wish, but the expected values are; + +* C<< normal_password >> +* C<< encrypted_password >> +* C<< kerberos_gssapi >> +* C<< ntlm >> +* C<< tls_certificate >> +* C<< oauth2 >> + +=head3 mail_server_helo_domain (optional, default is the local machine's domain name) + +This is the string passed to the target mail server for the C<< HELO >> or C<< EHLO >> string. See C<< https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol#SMTP_transport_example >> for more information. + +=head3 mail_server_password (optional) + +If needed to authenticate, this is the password portion passed along with the C<< mail_server_username >>. + +=head3 mail_server_port (optional, default depends on 'mail_server_security') + +If set, this is the TCP port used when connecting to th mail server. If not set, the port is detemined based on the C<< mail_server_security >>. If it is C<< none >> or C<< starttls >>, the port is C<< 143 >>. if is it C<< ssl_tls >>, the port is C<< 993 >>. + +=head3 mail_server_security (optional) + +This is the connection security used when establishing a connection to the mail server. + +This can be set to anything you wish, but the expected values are; + +* C<< none >> (default port 143) +* C<< starttls >> (default port 143) +* C<< ssl_tls >> (default port 993) + +B<< NOTE >> - If any other string is passed and C<< mail_server_port >> is not set, port C<< 143 >> will be used. + +=head3 mail_server_username (optional) + +If needed to authenticate, this is the user name portion passed along with the C<< mail_server_password >>. + +=head3 mail_server_uuid (optional) + +If set, this is the UUID that will be used to update a record in the database. If not set, it will be searched for by looking for a matching C<< mail_server_address >>. + +=cut +sub insert_or_update_mail_servers +{ + my $self = shift; + my $parameter = shift; + my $anvil = $self->parent; + my $debug = defined $parameter->{debug} ? $parameter->{debug} : 3; + $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "Database->insert_or_update_mail_servers()" }}); + + my $delete = defined $parameter->{'delete'} ? $parameter->{'delete'} : 0; + my $uuid = defined $parameter->{uuid} ? $parameter->{uuid} : ""; + my $file = defined $parameter->{file} ? $parameter->{file} : ""; + my $line = defined $parameter->{line} ? $parameter->{line} : ""; + my $mail_server_address = defined $parameter->{mail_server_address} ? $parameter->{mail_server_address} : ""; + my $mail_server_authentication = defined $parameter->{mail_server_authentication} ? $parameter->{mail_server_authentication} : "normal_password"; + my $mail_server_helo_domain = defined $parameter->{mail_server_helo_domain} ? $parameter->{mail_server_helo_domain} : ""; + my $mail_server_password = defined $parameter->{mail_server_password} ? $parameter->{mail_server_password} : ""; + my $mail_server_port = defined $parameter->{mail_server_port} ? $parameter->{mail_server_port} : ""; + my $mail_server_security = defined $parameter->{mail_server_security} ? $parameter->{mail_server_security} : "none"; + my $mail_server_username = defined $parameter->{mail_server_username} ? $parameter->{mail_server_username} : ""; + my $mail_server_uuid = defined $parameter->{mail_server_uuid} ? $parameter->{mail_server_uuid} : ""; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { + 'delete' => $delete, + uuid => $uuid, + file => $file, + line => $line, + mail_server_address => $mail_server_address, + mail_server_authentication => $mail_server_authentication, + mail_server_helo_domain => $mail_server_helo_domain, + mail_server_password => $mail_server_password, + mail_server_port => $mail_server_port, + mail_server_security => $mail_server_security, + mail_server_username => $mail_server_username, + mail_server_uuid => $mail_server_uuid, + }}); + + # Did we get a mail server name? + if ((not $mail_server_address) && (not $mail_server_uuid)) + { + $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, priority => "err", key => "log_0020", variables => { method => "Database->insert_or_update_mail_servers()", parameter => "mail_server_address" }}); + return(""); + } + + if (not $mail_server_uuid) + { + # Can we find it using the mail server address? + my $query = " +SELECT + mail_server_uuid +FROM + mail_servers +WHERE + mail_server_address = ".$anvil->Database->quote($mail_server_address)." +;"; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query }}); + + my $results = $anvil->Database->query({uuid => $uuid, query => $query, source => $file ? $file." -> ".$THIS_FILE : $THIS_FILE, line => $line ? $line." -> ".__LINE__ : __LINE__}); + my $count = @{$results}; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { + results => $results, + count => $count, + }}); + if ($count) + { + $mail_server_uuid = $results->[0]->[0]; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { mail_server_uuid => $mail_server_uuid }}); + } + } + + if ($delete) + { + if (not $mail_server_uuid) + { + $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, priority => "err", key => "log_0020", variables => { method => "Database->insert_or_update_mail_servers()", parameter => "mail_server_uuid" }}); + return(""); + } + else + { + # Delete it + my $query = "SELECT mail_server_helo_domain FROM mail_servers WHERE mail_server_uuid = ".$anvil->Database->quote($mail_server_uuid).";"; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query }}); + + my $results = $anvil->Database->query({uuid => $uuid, query => $query, source => $file ? $file." -> ".$THIS_FILE : $THIS_FILE, line => $line ? $line." -> ".__LINE__ : __LINE__}); + my $count = @{$results}; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { + results => $results, + count => $count, + }}); + if ($count) + { + my $old_mail_server_helo_domain = $results->[0]->[0]; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { old_mail_server_helo_domain => $old_mail_server_helo_domain }}); + + if ($old_mail_server_helo_domain ne "DELETED") + { + my $query = "UPDATE mail_servers SET mail_server_helo_domain = 'DELETED' WHERE mail_server_uuid = ".$anvil->Database->quote($mail_server_uuid).";"; + $anvil->Database->write({uuid => $uuid, query => $query, source => $file ? $file." -> ".$THIS_FILE : $THIS_FILE, line => $line ? $line." -> ".__LINE__ : __LINE__}); + } + return($mail_server_uuid); + } + else + { + # Not found. + return(""); + } + } + } + + # Fill some data + if (not $mail_server_helo_domain) + { + $mail_server_helo_domain = $anvil->_domain_name(); + if (not $mail_server_helo_domain) + { + # Fall back on 'localdomain' + $mail_server_helo_domain = "localdomain"; + } + } + if (not $mail_server_port) + { + $mail_server_port = 143; + if ($mail_server_security eq "ssl_tls") + { + $mail_server_port = 993; + } + } + + # If I still don't have an mail_server_uuid, we're INSERT'ing . + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { mail_server_uuid => $mail_server_uuid }}); + if (not $mail_server_uuid) + { + # INSERT + $mail_server_uuid = $anvil->Get->uuid(); + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { mail_server_uuid => $mail_server_uuid }}); + + my $query = " +INSERT INTO + mail_servers +( + mail_server_uuid, + mail_server_address, + mail_server_authentication, + mail_server_helo_domain, + mail_server_password, + mail_server_port, + mail_server_security, + mail_server_username, + modified_date +) VALUES ( + ".$anvil->Database->quote($mail_server_uuid).", + ".$anvil->Database->quote($mail_server_address).", + ".$anvil->Database->quote($mail_server_authentication).", + ".$anvil->Database->quote($mail_server_helo_domain).", + ".$anvil->Database->quote($mail_server_password).", + ".$anvil->Database->quote($mail_server_port).", + ".$anvil->Database->quote($mail_server_security).", + ".$anvil->Database->quote($mail_server_username).", + ".$anvil->Database->quote($anvil->data->{sys}{database}{timestamp})." +); +"; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query }}); + $anvil->Database->write({uuid => $uuid, query => $query, source => $file ? $file." -> ".$THIS_FILE : $THIS_FILE, line => $line ? $line." -> ".__LINE__ : __LINE__}); + } + else + { + # Query the rest of the values and see if anything changed. + my $query = " +SELECT + mail_server_address, + mail_server_authentication, + mail_server_helo_domain, + mail_server_password, + mail_server_port, + mail_server_security, + mail_server_username +FROM + mail_servers +WHERE + mail_server_uuid = ".$anvil->Database->quote($mail_server_uuid)." +;"; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query }}); + + my $results = $anvil->Database->query({uuid => $uuid, query => $query, source => $file ? $file." -> ".$THIS_FILE : $THIS_FILE, line => $line ? $line." -> ".__LINE__ : __LINE__}); + my $count = @{$results}; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { + results => $results, + count => $count, + }}); + if (not $count) + { + # I have a mail_server_uuid but no matching record. Probably an error. + $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, priority => "err", key => "log_0216", variables => { uuid_name => "mail_server_uuid", uuid => $mail_server_uuid }}); + return(""); + } + foreach my $row (@{$results}) + { + my $old_mail_server_address = $row->[0]; + my $old_mail_server_authentication = $row->[1]; + my $old_mail_server_helo_domain = $row->[2]; + my $old_mail_server_password = $row->[3]; + my $old_mail_server_port = $row->[4]; + my $old_mail_server_security = $row->[5]; + my $old_mail_server_username = $row->[6]; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { + old_mail_server_address => $old_mail_server_address, + old_mail_server_authentication => $old_mail_server_authentication, + old_mail_server_helo_domain => $old_mail_server_helo_domain, + old_mail_server_password => $old_mail_server_password, + old_mail_server_port => $old_mail_server_port, + old_mail_server_security => $old_mail_server_security, + old_mail_server_username => $old_mail_server_username, + }}); + + # Anything change? + if (($old_mail_server_address ne $mail_server_address) or + ($old_mail_server_authentication ne $mail_server_authentication) or + ($old_mail_server_helo_domain ne $mail_server_helo_domain) or + ($old_mail_server_password ne $mail_server_password) or + ($old_mail_server_port ne $mail_server_port) or + ($old_mail_server_security ne $mail_server_security) or + ($old_mail_server_username ne $mail_server_username)) + { + # Something changed, save. + my $query = " +UPDATE + mail_servers +SET + mail_server_address = ".$anvil->Database->quote($mail_server_address).", + mail_server_authentication = ".$anvil->Database->quote($mail_server_authentication).", + mail_server_helo_domain = ".$anvil->Database->quote($mail_server_helo_domain).", + mail_server_password = ".$anvil->Database->quote($mail_server_password).", + mail_server_port = ".$anvil->Database->quote($mail_server_port).", + mail_server_security = ".$anvil->Database->quote($mail_server_security).", + mail_server_username = ".$anvil->Database->quote($mail_server_username).", + modified_date = ".$anvil->Database->quote($anvil->data->{sys}{database}{timestamp})." +WHERE + mail_server_uuid = ".$anvil->Database->quote($mail_server_uuid)." +"; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { query => $query }}); + $anvil->Database->write({uuid => $uuid, query => $query, source => $file ? $file." -> ".$THIS_FILE : $THIS_FILE, line => $line ? $line." -> ".__LINE__ : __LINE__}); + } + } + } + + return($mail_server_uuid); +} + =head2 insert_or_update_network_interfaces This updates (or inserts) a record in the 'interfaces' table. This table is used to store physical network interface information. diff --git a/cgi-bin/striker b/cgi-bin/striker index 5a49a817..9e2dce94 100755 --- a/cgi-bin/striker +++ b/cgi-bin/striker @@ -405,54 +405,132 @@ sub process_email_server_page { my ($anvil) = @_; - if ($anvil->data->{cgi}{save}{value}) + # Prep the cgi variables. + my $say_outgoing_mail_server = defined $anvil->data->{cgi}{outgoing_mail_server}{value} ? $anvil->data->{cgi}{outgoing_mail_server}{value} : ""; + my $say_login_name = defined $anvil->data->{cgi}{login_name}{value} ? $anvil->data->{cgi}{login_name}{value} : ""; + my $say_login_password = defined $anvil->data->{cgi}{login_password}{value} ? $anvil->data->{cgi}{login_password}{value} : ""; + my $say_connection_security = defined $anvil->data->{cgi}{connection_security}{value} ? $anvil->data->{cgi}{connection_security}{value} : "ifn_link1"; + my $say_authentication_method = defined $anvil->data->{cgi}{authentication_method}{value} ? $anvil->data->{cgi}{authentication_method}{value} : "ifn_link1"; + my $say_back = defined $anvil->data->{cgi}{back}{value} ? $anvil->data->{cgi}{back}{value} : ""; + my $say_save = defined $anvil->data->{cgi}{save}{value} ? $anvil->data->{cgi}{save}{value} : ""; + my $say_confirm = defined $anvil->data->{cgi}{confirm}{value} ? $anvil->data->{cgi}{confirm}{value} : ""; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { + say_outgoing_mail_server => $say_outgoing_mail_server, + say_login_name => $say_login_name, + say_login_password => $say_login_password, + say_connection_security => $say_connection_security, + say_authentication_method => $say_authentication_method, + say_back => $say_back, + say_save => $say_save, + say_confirm => $say_confirm, + }}); + + if ($say_back) + { + $say_save = ""; + $say_confirm = ""; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { + say_save => $say_save, + say_confirm => $say_confirm, + }}); + } + + if ($say_save) { - # Verify it's sane. If not, send it back. + # Did the user give an outgoing mail server? + if (not $say_outgoing_mail_server) + { + # Just silently send them back to the form. + $say_save = ""; + $say_confirm = ""; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { + say_save => $say_save, + say_confirm => $say_confirm, + }}); + } - # Confirmed? - if ($anvil->data->{cgi}{save}{value}) + # Verify that the mail server is sane (it's all we can check) + if ((not $anvil->Validate->is_ipv4({ip => $say_outgoing_mail_server})) and + (not $anvil->Validate->is_domain_name({name => $say_outgoing_mail_server}))) { + # Bad domain + my $error_message = $anvil->Words->string({key => "warning_0023"}); + $anvil->data->{form}{error_massage} = $anvil->Template->get({file => "main.html", name => "error_message", variables => { error_message => $error_message }}); + $anvil->data->{cgi}{outgoing_mail_server}{alert} = 1; + $say_save = ""; + $say_confirm = ""; + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { + error_message => $error_message, + "form::error_massage" => $anvil->data->{form}{error_massage}, + "cgi::outgoing_mail_server::alert" => $anvil->data->{cgi}{outgoing_mail_server}{alert}, + say_save => $say_save, + say_confirm => $say_confirm, + }}); } } - ### Still here, show the menu. + # Still saving? + if ($say_save) + { + # Confirmed? + if ($say_confirm) + { + # Save! + } + else + { + # Ask the user to confirm + $anvil->data->{form}{back_link} = $anvil->data->{sys}{cgi_string}; + $anvil->data->{form}{back_link} =~ s/login_password=.*?&//; + $anvil->data->{form}{back_link} =~ s/login_password=.*?$//; + $anvil->data->{form}{back_link} =~ s/save=.*?&//; + $anvil->data->{form}{back_link} =~ s/save=.*?$//; + $anvil->data->{form}{refresh_link} = ""; + $anvil->data->{form}{body} = $anvil->Template->get({file => "email.html", name => "mail-server-confirm", variables => { + outgoing_mail_server => $say_outgoing_mail_server, + login_name => $say_login_name, + login_password => $say_login_password, + connection_security => $say_connection_security, + authentication_method => $say_authentication_method, + }}); + return(0); + } + } + # Outgoing mail server - my $say_outgoing_mail_server = defined $anvil->data->{cgi}{outgoing_mail_server}{value} ? $anvil->data->{cgi}{outgoing_mail_server}{value} : ""; my $outgoing_mail_server_class = $anvil->data->{cgi}{outgoing_mail_server}{alert} ? "input_alert" : "input_clear"; my $outgoing_mail_server_form = $anvil->Template->get({file => "main.html", name => "input_text_form", variables => { name => "outgoing_mail_server", id => "outgoing_mail_server", field => "#!string!striker_0168!#", description => "#!string!striker_0169!#", - value => defined $anvil->data->{cgi}{outgoing_mail_server}{value} ? $anvil->data->{cgi}{outgoing_mail_server}{value} : "", + value => $say_outgoing_mail_server, default_value => "", class => $outgoing_mail_server_class, extra => "", }}); # Login name - my $say_login_name = defined $anvil->data->{cgi}{login_name}{value} ? $anvil->data->{cgi}{login_name}{value} : ""; my $login_name_class = $anvil->data->{cgi}{login_name}{alert} ? "input_alert" : "input_clear"; my $login_name_form = $anvil->Template->get({file => "main.html", name => "input_text_form", variables => { name => "login_name", id => "login_name", field => "#!string!striker_0170!#", description => "#!string!striker_0171!#", - value => defined $anvil->data->{cgi}{login_name}{value} ? $anvil->data->{cgi}{login_name}{value} : "", + value => $say_login_name, default_value => "", class => $login_name_class, extra => "", }}); # Password - my $say_login_password = defined $anvil->data->{cgi}{login_password}{value} ? $anvil->data->{cgi}{login_password}{value} : ""; my $login_password_class = $anvil->data->{cgi}{login_password}{alert} ? "input_alert" : "input_clear"; my $login_password_form = $anvil->Template->get({file => "main.html", name => "input_text_form", variables => { name => "login_password", id => "login_password", field => "#!string!striker_0172!#", description => "#!string!striker_0173!#", - value => defined $anvil->data->{cgi}{login_password}{value} ? $anvil->data->{cgi}{login_password}{value} : "", + value => $say_login_password, default_value => "", class => $login_password_class, extra => "", @@ -464,10 +542,10 @@ sub process_email_server_page options => [ "none#!#".$anvil->Words->string({key => "striker_0174"}), "ssl_tls#!#".$anvil->Words->string({key => "striker_0175"}), - "starttls!#".$anvil->Words->string({key => "striker_0176"}) + "starttls#!#".$anvil->Words->string({key => "striker_0176"}) ], blank => 1, - selected => defined $anvil->data->{cgi}{connection_security}{value} ? $anvil->data->{cgi}{connection_security}{value} : "ifn_link1", + selected => $say_connection_security, class => $anvil->data->{cgi}{connection_security}{alert} ? "input_alert" : "input_clear", }); @@ -483,10 +561,11 @@ sub process_email_server_page "oauth2#!#".$anvil->Words->string({key => "striker_0182"}) ], blank => 1, - selected => defined $anvil->data->{cgi}{authentication_method}{value} ? $anvil->data->{cgi}{authentication_method}{value} : "ifn_link1", + selected => $say_authentication_method, class => $anvil->data->{cgi}{authentication_method}{alert} ? "input_alert" : "input_clear", }); + # Still here, show the menu. $anvil->data->{form}{back_link} = "?"; $anvil->data->{form}{refresh_link} = "?email=true"; $anvil->data->{form}{body} = $anvil->Template->get({file => "email.html", name => "mail-server-menu", variables => { @@ -497,7 +576,6 @@ sub process_email_server_page authentication_method => $authentication_method_select, }}); - return(0); } @@ -1381,7 +1459,6 @@ sub process_prep_network } # Confirmed? - $anvil->data->{cgi}{confirm}{value} = "" if not defined $anvil->data->{cgi}{confirm}{value}; if (($anvil->data->{cgi}{confirm}{value}) && ($sane)) { # Yes, save the job. diff --git a/html/skins/alteeve/email.html b/html/skins/alteeve/email.html index 24226143..7548a950 100644 --- a/html/skins/alteeve/email.html +++ b/html/skins/alteeve/email.html @@ -102,3 +102,98 @@ + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ #!string!message_0154!# +
+   +
+ #!string!message_0155!# +
+   +
+ + + + + + + + + + + + + + + + + + + + + +
+ #!string!striker_0168!# + +   #!variable!outgoing_mail_server!# + +
+ #!string!striker_0170!# + +   #!variable!login_name!# + +
+ #!string!striker_0172!# + +   #!variable!login_password!# + +
+ #!string!striker_0183!# + +   #!variable!connection_security!# + +
+ #!string!striker_0184!# + +   #!variable!authentication_method!# + +
+
+   +
+ + + +
+ diff --git a/share/anvil.sql b/share/anvil.sql index 395c4046..df7eb88e 100644 --- a/share/anvil.sql +++ b/share/anvil.sql @@ -554,7 +554,7 @@ CREATE TABLE mail_servers ( mail_server_address text not null, -- example; mail.example.com mail_server_port integer not null, -- The TCP port used to connect to the server. mail_server_username text not null, -- This is the user name (usually email address) used when authenticating against the mail server. - mail_server_password text, -- This is the password used when authenticating against the mail server + mail_server_password text not null, -- This is the password used when authenticating against the mail server mail_server_security text not null, -- This is the security type used when authenticating against the mail server (STARTTLS, TLS/SSL or NONE) mail_server_authentication text not null, -- 'None', 'Plain Text', 'Encrypted'. mail_server_helo_domain text not null, -- The domain we identify to the mail server as being from. The default is to use the domain name of the host. diff --git a/share/words.xml b/share/words.xml index 96bc7786..1559341b 100644 --- a/share/words.xml +++ b/share/words.xml @@ -1208,6 +1208,7 @@ Failure! The return code: [#!variable!return_code!#] was received ('0' was expec The passed in parameter '#!variable!parameter!#': [#!variable!subnet_mask!#] is not a valid IPv4 subnet mask. All three networks require the first network pair to be defined. Only one network interface selected for a network pair. + The outgoing mail server appear to not be a valid domain name or IP address. There are not enough network interfaces on this machine. You have: [#!variable!interface_count!#] interface(s), and you need at least: [#!variable!required_interfaces_for_single!#] interfaces to connect to the requested networks (one for Back-Channel and one for each Internet-Facing network).