ssl_disable has been replaced with ssl
authorJamie Cameron <jcameron@webmin.com>
Tue, 21 Jul 2009 00:59:39 +0000 (17:59 -0700)
committerJamie Cameron <jcameron@webmin.com>
Tue, 21 Jul 2009 00:59:39 +0000 (17:59 -0700)
dovecot/edit_net.cgi
dovecot/save_net.cgi

index 6016949..216cd54 100755 (executable)
@@ -15,12 +15,14 @@ print &ui_table_row($text{'net_protocols'},
                [ map { [ $_, $text{'net_'.$_} ] } @supported_protocols ],
                scalar(@supported_protocols), 1, 1));
 
-$dis = &find_value("ssl_disable", $conf);
+# SSL supported?
+$sslopt = &find("ssl_disable", $conf, 2) ? "ssl_disable" : "ssl";
+$dis = &find_value($sslopt, $conf);
 @opts = ( [ "no", $text{'yes'} ], [ "yes", $text{'no'} ] );
 print &ui_table_row($text{'net_ssl_disable'},
-           &ui_radio("ssl_disable", $dis,
+           &ui_radio($sslopt, $dis,
                      [ @opts,
-                       [ "", &getdef("ssl_disable", \@opts) ] ]));
+                       [ "", &getdef($sslopt, \@opts) ] ]));
 
 @listens = &find("imap_listen", $conf, 2) ?
                ("imap_listen", "pop3_listen", "imaps_listen", "pop3s_listen") :
index b2949c5..54d1517 100755 (executable)
@@ -8,7 +8,8 @@ require './dovecot-lib.pl';
 $conf = &get_config();
 
 &save_directive($conf, "protocols", join(" ", split(/\0/, $in{'protocols'})));
-&save_directive($conf, "ssl_disable", $in{'ssl_disable'} eq '' ? undef : $in{'ssl_disable'});
+$sslopt = &find("ssl_disable", $conf, 2) ? "ssl_disable" : "ssl";
+&save_directive($conf, $sslopt, $in{$sslopt} eq '' ? undef : $in{$sslopt});
 @listens = &find("imap_listen", $conf, 2) ?
                ("imap_listen", "pop3_listen", "imaps_listen", "pop3s_listen") :
                ("listen", "ssl_listen");