Merged revisions 1806-1811,1816 from stable.

tbrehm

2010-06-09 a59ad3ae1bd0b9bf773120074113f4a9cf19864f

 server/plugins-available/postfix_server_plugin.inc.php

@@ -86,7 +86,11 @@
      
      if($mail_config["relayhost"] != '') {
         exec("postconf -e 'relayhost = ".$mail_config["relayhost"]."'");
         exec("postconf -e 'smtp_sasl_auth_enable = yes'");
         if($mail_config["relayhost_user"] != '' && $mail_config["relayhost_password"] != '') {
            exec("postconf -e 'smtp_sasl_auth_enable = yes'");
         } else {
            exec("postconf -e 'smtp_sasl_auth_enable = no'");
         }
         exec("postconf -e 'smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd'");
         exec("postconf -e 'smtp_sasl_security_options ='");