Mailinglist Archive: yast-commit (953 mails)

< Previous Next >
[yast-commit] r49581 - in /trunk/ldap-server/src: tree_structure.ycp widgets.ycp
  • From: rhafer@xxxxxxxxxxxxxxxx
  • Date: Fri, 01 Aug 2008 13:37:04 -0000
  • Message-id: <20080801133704.C405A272F4@xxxxxxxxxxxxxxxx>
Author: rhafer
Date: Fri Aug 1 15:37:04 2008
New Revision: 49581

URL: http://svn.opensuse.org/viewcvs/yast?rev=49581&view=rev
Log:
- removed lint
- offer to start CA Management Module (Fate#303546)

Modified:
trunk/ldap-server/src/tree_structure.ycp
trunk/ldap-server/src/widgets.ycp

Modified: trunk/ldap-server/src/tree_structure.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.ycp?rev=49581&r1=49580&r2=49581&view=diff
==============================================================================
--- trunk/ldap-server/src/tree_structure.ycp (original)
+++ trunk/ldap-server/src/tree_structure.ycp Fri Aug 1 15:37:04 2008
@@ -483,127 +483,9 @@
string name = UI::AskForExistingFile( "/var/lib/CAM", "*.pem *.crt *",
_("Select Certificate Key File") );
if( name != nil ) UI::ChangeWidget( `te_key_file, `Value, name );
}
- else if( handler_cmd == `pb_edit )
+ else if( handler_cmd == `pb_launch_ca )
{
-// //show edit popup
- any ret = nil;
-// string dlg_name = common_ca_available ? "type" : "import";
-// term dlg = (term)widget_map["g_tls","dialogs",dlg_name]:nil;
-// if( dlg == nil )
-// {
-// callback_error = _("An internal error occurred. View the log
file.");
-// y2error( "cb_input_tls: type dialog is not in widget map" );
-// return false;
-// }
-//
-// UI::OpenDialog( dlg );
-//
-// map<string,string> importPaths =
LdapServer::ReadImportCertificates();
-// if( dlg_name == "input" )
-// {
-// UI::ChangeWidget( `te_cert_file, `Value,
importPaths["ServerCertificateFile"]:"" );
-// UI::ChangeWidget( `te_key_file, `Value,
importPaths["ServerKeyFile"]:"" );
-// UI::ChangeWidget( `te_ca_file, `Value,
importPaths["CACertificatesFile"]:"" );
-// }
-//
-// if( dlg_name == "type" && haskey( importPaths,
"ServerCertificateFile" ) )
-// {
-// UI::ChangeWidget( `rb_common, `Value, false );
-// UI::ChangeWidget( `rb_import, `Value, true );
-// }
-//
-// y2milestone( ">>>> entering cb_input_tls input loop..." );
-// while( true )
-// {
-// ret = UI::UserInput();
-// y2milestone( "cb_input_tls: dialog returns '%1'", ret );
-//
-// if( dlg_name == "type" )
-// {
-// if( ret == `cancel ) break;
-// else if( ret == `ok )
-// {
-// any do_what = UI::QueryWidget( `rbg_type, `CurrentButton
);
-// y2milestone( "cb_input_tls: do_what is '%1'", do_what );
-// if( do_what == `rb_common )
-// {
-// //TODO: use common ca
-// y2milestone( "cb_input_tls: using common server
certificate" );
-// LdapServer::WriteConfigureCommonServerCertificate(
true );
-// LdapServer::WriteImportCertificates( $[] );
-// break;
-// } else if( do_what == `rb_import )
-// {
-// UI::CloseDialog();
-// dlg_name = "import";
-// UI::OpenDialog(
(term)widget_map["g_tls","dialogs","import"]:`Label(_("Dialog not found")));
-//
-// //fill textentries
-// UI::ChangeWidget( `te_cert_file, `Value,
importPaths["ServerCertificateFile"]:"" );
-// UI::ChangeWidget( `te_key_file, `Value,
importPaths["ServerKeyFile"]:"" );
-// UI::ChangeWidget( `te_ca_file, `Value,
importPaths["CACertificatesFile"]:"" );
-// continue;
-// }
-// }
-// } else if( dlg_name == "import" )
-// {
-// if( ret == `cancel ) break;
-// else if( ret == `pb_ca_file )
-// {
-// /* file
selection headline */
-// string name = UI::AskForExistingFile( "/var/lib/CAM",
"*.pem *.crt *", _("Select CA Certificate File") );
-// if( name != nil ) UI::ChangeWidget( `te_ca_file, `Value,
name );
-// continue;
-// } else if( ret == `pb_cert_file )
-// {
-// /* file
selection headline */
-// string name = UI::AskForExistingFile( "/var/lib/CAM",
"*.pem *.crt *", _("Select Certificate File") );
-// if( name != nil ) UI::ChangeWidget( `te_cert_file,
`Value, name );
-// continue;
-// } else if( ret == `pb_key_file )
-// {
-// /* file
selection headline */
-// string name = UI::AskForExistingFile( "/var/lib/CAM",
"*.pem *.crt *", _("Select Certificate Key File") );
-// if( name != nil ) UI::ChangeWidget( `te_key_file,
`Value, name );
-// continue;
-// } else if( ret == `ok )
-// {
-// //TODO: import ca
-// //read values
-// string cert_file = String::CutBlanks(
(string)UI::QueryWidget( `te_cert_file, `Value ) );
-// string key_file = String::CutBlanks(
(string)UI::QueryWidget( `te_key_file, `Value ) );
-// string ca_file = String::CutBlanks(
(string)UI::QueryWidget( `te_ca_file, `Value ) );
-//
-// if( cert_file == "" )
-// {
-// /* Error Popup */
-// Popup::Error( _("Server certificate file is
required.") );
-// continue;
-// }
-//
-// if( key_file == "" )
-// {
-// /* Error Popup */
-// Popup::Error( _("Server key file is required.") );
-// continue;
-// }
-//
-// importPaths["ServerCertificateFile"] = cert_file;
-// importPaths["ServerKeyFile"] = key_file;
-// if( ca_file != "" ) importPaths["CACertificatesFile"] =
ca_file;
-//
-// y2milestone( "importing certificates" );
-// LdapServer::WriteImportCertificates( importPaths );
-// LdapServer::WriteConfigureCommonServerCertificate( false
);
-//
-// break;
-// }
-// }
-// }
-// y2milestone( "<<<< leaving cb_input_tls input loop..." );
-//
-// UI::CloseDialog();
-// eval( cb_read_tls() );
+ WFM::CallFunction("ca_mgm", [] );
}
//reread tls page
return true;

Modified: trunk/ldap-server/src/widgets.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=49581&r1=49580&r2=49581&view=diff
==============================================================================
--- trunk/ldap-server/src/widgets.ycp (original)
+++ trunk/ldap-server/src/widgets.ycp Fri Aug 1 15:37:04 2008
@@ -194,6 +194,10 @@
)
)
)
+ ),
+ `VSpacing( 0.5 ),
+ `Left(
+ `PushButton( `id( `pb_launch_ca ), _("Launch CA Management
Module") )
)
)
);

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages