BUG10965: only write auth.conf if username/password are set

auth.conf was always written, even if no username/password provided.
In this case only the ip or Hostname of the mailserver was written into
auth.conf. Now the file is only filled if username/password are filled.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>

diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi
index be663a62e02dadac56cace7c5d3a1d5d672b5e05..f5be10407b0f8dc8964a37099c487e1910f282a1 100755 (executable)
--- a/html/cgi-bin/mail.cgi
+++ b/html/cgi-bin/mail.cgi
@@ -110,9 +110,12 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ #SaveButton on configsite
                $mail{'SENDER'}                 = $cgiparams{'txt_mailsender'};
                $mail{'RECIPIENT'}              = $cgiparams{'txt_recipient'};
 
-               $auth{'AUTHNAME'}               = $cgiparams{'txt_mailuser'};
-               $auth{'AUTHPASS'}               = $cgiparams{'txt_mailpass'};
-               $auth{'AUTHHOST'}               = $cgiparams{'txt_mailserver'};
+               if ($cgiparams{'txt_mailuser'} && $cgiparams{'txt_mailpass'}) {
+                       $auth{'AUTHNAME'}               = $cgiparams{'txt_mailuser'};
+                       $auth{'AUTHPASS'}               = $cgiparams{'txt_mailpass'};
+                       $auth{'AUTHHOST'}               = $cgiparams{'txt_mailserver'};
+                       print TXT1 "$auth{'AUTHNAME'}|$auth{'AUTHHOST'}:$auth{'AUTHPASS'}\n";
+               }
 
                $dma{'SMARTHOST'}               = $cgiparams{'txt_mailserver'};
                $dma{'PORT'}                    = $cgiparams{'txt_mailport'};
@@ -129,7 +132,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ #SaveButton on configsite
                        print TXT "$k $v\n";
                }
                close TXT;
-               print TXT1 "$auth{'AUTHNAME'}|$auth{'AUTHHOST'}:$auth{'AUTHPASS'}\n";
+               close TXT1;
                close TXT2;
 
        }else{