Author: mzugec Date: Mon May 12 14:57:18 2008 New Revision: 47454 URL: http://svn.opensuse.org/viewcvs/yast?rev=47454&view=rev Log: don't allow user to choose SSL for main host (bnc#383333) Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/HttpServerWidgets.ycp Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=47454&r1=47453&r2=47454&view=diff ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Mon May 12 14:57:18 2008 @@ -1 +1 @@ -2.16.8 +2.16.9 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-server.changes?rev=47454&r1=47453&r2=47454&view=diff ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Mon May 12 14:57:18 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 12 14:52:28 CEST 2008 - mzugec@suse.cz + +- don't allow user to choose SSL for main host (bnc#383333) +- 2.16.9 + +------------------------------------------------------------------- Wed Apr 30 13:57:22 CEST 2008 - mzugec@suse.cz - enable/disable https by firewall (bnc#384692) Modified: trunk/http-server/src/HttpServerWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServerWidgets.ycp?rev=47454&r1=47453&r2=47454&view=diff ============================================================================== --- trunk/http-server/src/HttpServerWidgets.ycp (original) +++ trunk/http-server/src/HttpServerWidgets.ycp Mon May 12 14:57:18 2008 @@ -163,6 +163,7 @@ //TODO: don't allow user to use this directive !!! //main server can't use SSL + boolean valid=true; if ( hostid == "main" ) { foreach(map value, server, { @@ -170,10 +171,12 @@ { //translators: popup error message when validate server Report::Error ( _("The default host cannot be configured with SSL support.") ); + valid=false; return false; } }); } + if (!valid) return false; list <string> hosts = YaST::HTTPDData::GetHostsList (); @@ -2294,12 +2297,14 @@ return showErrorLogPopup( key, event ); } */ - symbol res = TablePopup::TableHandle( hostwidget, key, event ); + symbol res = TablePopup::TableHandleWrapper ( key, event ); +/* if (update_contents) { update_contents = false; TablePopup::TableInit( hostwidget, key); } +*/ return res; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org