February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67497 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp modules/ZFCPController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 18:56:56 2012 New Revision: 67497 URL: http://svn.opensuse.org/viewcvs/yast?rev=67497&view=rev Log: - added functions to format channel, wwpn and fcp-lun Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Tue Feb 21 18:56:56 2012 @@ -185,10 +185,8 @@ `Table(`id(`table), `opt(`multiSelection), header, []), Mode::config () ? `HBox ( - // push button - `PushButton (`id (`add), _("A&dd New Disk")), - // push button - `PushButton (`id (`delete), _("De&lete Disk")), + `PushButton(`id(`add), Label::AddButton()), + `PushButton(`id(`delete), Label::DeleteButton()), `HStretch () ) : `HBox ( @@ -241,7 +239,7 @@ string filter_min = (string) UI::QueryWidget(`min_chan, `Value); string filter_max = (string) UI::QueryWidget(`max_chan, `Value); - if (!DASDController::ValidChannel(filter_min) || !DASDController::ValidChannel(filter_max)) + if (!DASDController::IsValidChannel(filter_min) || !DASDController::IsValidChannel(filter_max)) { // error popup Popup::Error(_("Invalid filter channels.")); @@ -249,8 +247,8 @@ continue; } - DASDController::filter_min = filter_min; - DASDController::filter_max = filter_max; + DASDController::filter_min = DASDController::FormatChannel(filter_min); + DASDController::filter_max = DASDController::FormatChannel(filter_max); ReloadDASDDialog (); ret = nil; @@ -508,7 +506,7 @@ { string channel = (string) UI::QueryWidget(`id(`channel), `Value); - if (!DASDController::ValidChannel(channel)) + if (!DASDController::IsValidChannel(channel)) { // error popup Popup::Error(_("Not a valid channel.")); @@ -517,6 +515,8 @@ continue; } + channel = DASDController::FormatChannel(channel); + if (DASDController::GetDeviceIndex(channel) != nil) { // error popup @@ -534,6 +534,8 @@ boolean format = (boolean) UI::QueryWidget(`id(`format), `Value); boolean diag = (boolean) UI::QueryWidget(`id(`diag), `Value); + channel = DASDController::FormatChannel(channel); + map<string, any> d = $[ "channel" : channel, "format" : format, Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Tue Feb 21 18:56:56 2012 @@ -107,11 +107,21 @@ } - global boolean ValidChannel(string channel) + global boolean IsValidChannel(string channel) { - string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{4})$"; + string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{1,4})$"; return regexpmatch(channel, regexp); } + + global string FormatChannel(string channel) + { + if (!IsValidChannel(channel)) + return channel; + + list<string> strs = splitstring(channel, "."); + strs[2] = String::PadZeros(strs[2]:"", 4); + return mergestring(strs, "."); + } /** @@ -202,6 +212,8 @@ devices = listmap (map<string, any> d, settings["devices"]:[], { index = index + 1; + d["channel"] = FormatChannel(d["channel"]:""); + d = filter(string k, any v, d, { return contains([ "channel", "format", "diag" ], k); }); Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Tue Feb 21 18:56:56 2012 @@ -16,6 +16,7 @@ import "Mode"; import "Report"; import "Popup"; + import "String"; global map<integer,map<string,any> > devices = $[]; @@ -116,24 +117,50 @@ } - global boolean ValidChannel(string channel) + global boolean IsValidChannel(string channel) { - string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{4})$"; + string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{1,4})$"; return regexpmatch(channel, regexp); } - global boolean ValidWWPN(string wwpn) + global string FormatChannel(string channel) { - string regexp = "^0x([0-9a-fA-F]{16})$"; + if (!IsValidChannel(channel)) + return channel; + + list<string> strs = splitstring(channel, "."); + strs[2] = String::PadZeros(strs[2]:"", 4); + return mergestring(strs, "."); + } + + global boolean IsValidWWPN(string wwpn) + { + string regexp = "^0x([0-9a-fA-F]{1,16})$"; return regexpmatch(wwpn, regexp); } - global boolean ValidFCPLUN(string fcp_lun) + global string FormatWWPN(string wwpn) + { + if (!IsValidWWPN(wwpn)) + return wwpn; + + return tohexstring(tointeger(wwpn), 16); + } + + global boolean IsValidFCPLUN(string fcp_lun) { - string regexp = "^0x([0-9a-fA-F]{16})$"; + string regexp = "^0x([0-9a-fA-F]{1,16})$"; return regexpmatch(fcp_lun, regexp); } + global string FormatFCPLUN(string fcp_lun) + { + if (!IsValidFCPLUN(fcp_lun)) + return fcp_lun; + + return tohexstring(tointeger(fcp_lun), 16); + } + global string GetNextLUN(string fcp_lun) { @@ -219,9 +246,9 @@ index = index + 1; map<string, any> m = $[ "detail" : $[ - "controller_id" : d["controller_id"]:"", - "wwpn" : d["wwpn"]:"", - "fcp_lun" : d["fcp_lun"]:"", + "controller_id" : FormatChannel(d["controller_id"]:""), + "wwpn" : FormatWWPN(d["wwpn"]:""), + "fcp_lun" : FormatFCPLUN(d["fcp_lun"]:""), ], ]; return $[ index : m ]; Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 18:56:56 2012 @@ -168,7 +168,7 @@ string filter_min = (string) UI::QueryWidget(`min_chan, `Value); string filter_max = (string) UI::QueryWidget(`max_chan, `Value); - if (!ZFCPController::ValidChannel(filter_min) || !ZFCPController::ValidChannel(filter_max)) + if (!ZFCPController::IsValidChannel(filter_min) || !ZFCPController::IsValidChannel(filter_max)) { // error popup Popup::Error(_("Invalid filter channels.")); @@ -176,8 +176,8 @@ continue; } - ZFCPController::filter_min = filter_min; - ZFCPController::filter_max = filter_max; + ZFCPController::filter_min = ZFCPController::FormatChannel(filter_min); + ZFCPController::filter_max = ZFCPController::FormatChannel(filter_max); ReloadZFCPDialog(); ret = nil; @@ -297,7 +297,7 @@ string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); string fcp_lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); - if (!ZFCPController::ValidChannel(channel)) + if (!ZFCPController::IsValidChannel(channel)) { // error popup Popup::Error(_("Not a valid channel.")); @@ -306,7 +306,7 @@ continue; } - if (!ZFCPController::ValidWWPN(wwpn)) + if (!ZFCPController::IsValidWWPN(wwpn)) { // error popup Report::Error(_("The entered WWPN is invalid.")); @@ -315,7 +315,7 @@ continue; } - if (!ZFCPController::ValidFCPLUN(fcp_lun)) + if (!ZFCPController::IsValidFCPLUN(fcp_lun)) { // error popup Report::Error(_("The entered FCP-LUN is invalid.")); @@ -332,6 +332,10 @@ string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); string lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); + channel = ZFCPController::FormatChannel(channel); + wwpn = ZFCPController::FormatWWPN(wwpn); + lun = ZFCPController::FormatFCPLUN(lun); + ZFCPController::previous_settings["channel"] = channel; ZFCPController::previous_settings["wwpn"] = wwpn; ZFCPController::previous_settings["fcp_lun"] = lun; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67496 - in /trunk/s390/src/clients: dasd_proposal.ycp inst_dasd.ycp inst_zfcp.ycp zfcp_proposal.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 14:42:09 2012 New Revision: 67496 URL: http://svn.opensuse.org/viewcvs/yast?rev=67496&view=rev Log: - use correct CloseDialog - cleanup Modified: trunk/s390/src/clients/dasd_proposal.ycp trunk/s390/src/clients/inst_dasd.ycp trunk/s390/src/clients/inst_zfcp.ycp trunk/s390/src/clients/zfcp_proposal.ycp Modified: trunk/s390/src/clients/dasd_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd_proposal.y… ============================================================================== --- trunk/s390/src/clients/dasd_proposal.ycp (original) +++ trunk/s390/src/clients/dasd_proposal.ycp Tue Feb 21 14:42:09 2012 @@ -6,9 +6,7 @@ * * Proposal function dispatcher for dasd configuration. */ - { - textdomain "s390"; import "DASDController"; @@ -22,7 +20,7 @@ if ( func == "MakeProposal" ) { list summary = DASDController::Summary(); - if (size (summary) == 0) + if (isempty(summary)) // text for installation summary summary = [ _("No DASD disk detected") ]; // Fill return map @@ -37,7 +35,7 @@ { Wizard::CreateDialog (); any sequence = WFM::CallFunction ("inst_dasd", []); - UI::CloseDialog (); + Wizard::CloseDialog (); // Fill return map ret = $[ "workflow_sequence" : sequence @@ -63,7 +61,4 @@ } return ret; - -/* EOF */ } - Modified: trunk/s390/src/clients/inst_dasd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/inst_dasd.ycp?r… ============================================================================== --- trunk/s390/src/clients/inst_dasd.ycp (original) +++ trunk/s390/src/clients/inst_dasd.ycp Tue Feb 21 14:42:09 2012 @@ -8,33 +8,19 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("DASD installation module started"); include "s390/dasd/wizards.ycp"; -/* main ui function */ -any ret = nil; - -//ret = CommandLine::Run(cmdline_description); -ret = MainDASDSequence (); +any ret = MainDASDSequence(); y2debug("ret=%1", ret); -/* Finish */ y2milestone("DASD installation module finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } Modified: trunk/s390/src/clients/inst_zfcp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/inst_zfcp.ycp?r… ============================================================================== --- trunk/s390/src/clients/inst_zfcp.ycp (original) +++ trunk/s390/src/clients/inst_zfcp.ycp Tue Feb 21 14:42:09 2012 @@ -8,33 +8,19 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("ZFCP installation module started"); include "s390/zfcp/wizards.ycp"; -/* main ui function */ -any ret = nil; - -//ret = CommandLine::Run(cmdline_description); -ret = MainZFCPSequence (); +any ret = MainZFCPSequence(); y2debug("ret=%1", ret); -/* Finish */ y2milestone("ZFCP module finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } Modified: trunk/s390/src/clients/zfcp_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp_proposal.y… ============================================================================== --- trunk/s390/src/clients/zfcp_proposal.ycp (original) +++ trunk/s390/src/clients/zfcp_proposal.ycp Tue Feb 21 14:42:09 2012 @@ -6,9 +6,7 @@ * * Proposal function dispatcher for zfcp configuration. */ - { - textdomain "s390"; import "ZFCPController"; @@ -22,7 +20,7 @@ if ( func == "MakeProposal" ) { list summary = ZFCPController::Summary(); - if (size (summary) == 0) + if (isempty(summary)) // text for installation summary summary = [ _("No zFCP device configured") ]; // Fill return map @@ -37,7 +35,7 @@ { Wizard::CreateDialog (); any sequence = WFM::CallFunction ("inst_zfcp", []); - UI::CloseDialog (); + Wizard::CloseDialog (); // Fill return map ret = $[ "workflow_sequence" : sequence @@ -63,7 +61,4 @@ } return ret; - -/* EOF */ } - -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67495 - /tags/stable-2_22_4/ldap-client/
by jsuchome＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: jsuchome Date: Tue Feb 21 11:30:52 2012 New Revision: 67495 URL: http://svn.opensuse.org/viewcvs/yast?rev=67495&view=rev Log: Created tag stable-2_22_4 for ldap-client Added: tags/stable-2_22_4/ldap-client/ - copied from r67494, trunk/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67494 - /trunk/ncurses-pkg/src/NCPkgPackageDetails.cc
by gs＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: gs Date: Tue Feb 21 11:30:03 2012 New Revision: 67494 URL: http://svn.opensuse.org/viewcvs/yast?rev=67494&view=rev Log: also create html paragraphs when showing package description Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Tue Feb 21 11:30:03 2012 @@ -123,7 +123,7 @@ text += pkgPtr->description(); // show the description - setValue( text ); + setValue( createHtmlParagraphs(text) ); } void NCPkgPackageDetails::technicalData( ZyppObj pkgPtr, ZyppSel slbPtr ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67493 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes
by jsuchome＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: jsuchome Date: Tue Feb 21 11:28:15 2012 New Revision: 67493 URL: http://svn.opensuse.org/viewcvs/yast?rev=67493&view=rev Log: - removed password policies configuration from client, relevant parts moved to server configuration (fate #313143) - 2.22.4 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=67493&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Tue Feb 21 11:28:15 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Tue Feb 21 11:28:15 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 21 11:06:29 CET 2012 - jsuchome(a)suse.cz + +- removed password policies configuration from client, relevant parts + moved to server configuration (fate #313143) +- 2.22.4 + +------------------------------------------------------------------- Thu Feb 2 15:00:26 CET 2012 - jsuchome(a)suse.cz - removed option to switch off TLS/SSL from UI -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67492 - in /trunk: ldap-client/src/LdapPopup.ycp ldap-server/package/yast2-ldap-server.changes ldap-server/src/LdapDatabase.ycp ldap-server/src/widgets.ycp
by jsuchome＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: jsuchome Date: Tue Feb 21 11:26:43 2012 New Revision: 67492 URL: http://svn.opensuse.org/viewcvs/yast?rev=67492&view=rev Log: PasswordPolicyDialog moved from ldap-client to ldap-server Modified: trunk/ldap-client/src/LdapPopup.ycp trunk/ldap-server/package/yast2-ldap-server.changes trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-client/src/LdapPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/LdapPopup.ycp?re… ============================================================================== --- trunk/ldap-client/src/LdapPopup.ycp (original) +++ trunk/ldap-client/src/LdapPopup.ycp Tue Feb 21 11:26:43 2012 @@ -566,371 +566,4 @@ return $[ "attr": attr, "value": new_value ]; } -/** - * dialog for Password Policy configuration object - * @param ppolicy data with Password Policy object to be edited (as obtained from LDAP search) - * @return map with modifications of ppolicy object, nil in case of `cancel - */ -global define map PasswordPolicyDialog (map ppolicy) { - - // reduce the list values to single ones - ppolicy = mapmap (string a, any val, (map<string,any>)ppolicy, { - if (is (val, list) && (Ldap::SingleValued (a) || size ((list)val) == 1)) - val = ((list)val)[0]:nil; - if (val == "TRUE" || val == "FALSE") - val = (val == "TRUE"); - return $[ a: val ]; - }); - map ppolicy_orig = ppolicy; - - // help text for Password Policy Dialog - string help_text = _("Select the Password Change Policies, Password Aging Policies, and Lockout Policies tabs to choose LDAP password policy groups of attributes to configure."); - - - // tab-specific help texts - map tabs_help_text = $[ - // help text for pwdInHistory attribute - `pwchange : _("Specify the Maximum Number of Passwords Stored in History to set how many previously used passwords should be saved. Saved passwords may not be used.") + - - // help text for pwdMustChange attribute - _("Check User Must Change Password after Reset to force users to change their passwords after the password is reset or changed by an administrator.") + - - // help text for pwdAllowUserChange attribute - _("Check User Can Change Password to allow users to change their passwords.") + - - // help text for pwdSafeModify attribute - _("If the existing password must be provided along with the new password, check Old Password Required for Password Change.") + - - // help text for pwdCheckQuality attribute - _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be evaluated. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user provides an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + - - // help text for pwdMinLength attribute - _("Set the minimum number of characters that must be used in a password in Minimum Password Length."), - - // help text for pwdMinAge attribute - `aging : _("Minimum Password Age sets how much time must pass between modifications to the password.") + - - // help text for pwdMaxAge attribute - _("Maximum Password Age sets how long after modification a password expires.") + - - // help text for pwdExpireWarning attribute - _("In Time before Password Expiration to Issue Warning specify how long\nbefore expiration an authenticating user should be warned.") + - - // help text for pwdGraceAuthNLimit attribute - _("Set the number of times an expired password can be used to authenticate in Allowed Uses of an Expired Password."), - - // help text for pwdLockout attribute - `lockout : _("Check Enable Password Locking to forbid use of a password after a specified number of consecutive failed bind attempts.") + - - // help text for pwdMaxFailure attribute - _("Set the number of consecutive failed bind attempts after which the password may not be used to authenticate in Bind Failures to Lock the Password.") + - - // help text for pwdLockoutDuration attribute - _("Set for how long the password cannot be used in Password Lock Duration.") + - - // help text for pwdFailureCountInterval attribute - _("Bind Failures Cache Duration specifies the time after which password failures are purged from the failure counter even if no successful authentication has occurred."), - ]; - - // map of attribute names for each tab - map attributes = $[ - `pwchange : [ - "pwdInHistory", "pwdMustChange", "pwdAllowUserChange", - "pwdSafeModify", "pwdCheckQuality", "pwdMinLength" - ], - `aging : [ - "pwdMinAge", "pwdMaxAge", "pwdExpireWarning", "pwdGraceAuthNLimit" - ], - `lockout : [ - "pwdLockout", "pwdLockoutDuration", "pwdMaxFailure", - "pwdFailureCountInterval" - ], - ]; - - list time_attributes = [ - "pwdMinAge", "pwdMaxAge", "pwdExpireWarning", "pwdLockoutDuration", - "pwdFailureCountInterval" - ]; - - map default_values = $[ - "pwdMustChange" : false, - "pwdAllowUserChange" : true, - "pwdSafeModify" : false, - "pwdLockout" : false, - ]; - - // maximal value of IntFields - integer max = 99999; - - list<term> tabs = [ - // tab label - `item(`id(`pwchange), _("&Password Change Policies"), true), - // tab label - `item(`id(`aging), _("Pa&ssword Aging Policies")), - // tab label - `item(`id(`lockout), _("&Lockout Policies")), - ]; - term tabs_term = `VBox ( - `DumbTab (`id(`tabs), tabs, - `ReplacePoint(`id(`tabContents ), `VBox (`Empty ()))) - ); - boolean has_tabs = true; - if (!UI::HasSpecialWidget (`DumbTab)) - { - has_tabs = false; - term tabbar = `HBox (); - foreach (term it, tabs, { - string label = it[1]:""; - tabbar = add (tabbar,`PushButton (it[0]:`id(label), label)); - }); - tabs_term = `VBox (`Left(tabbar), - `Frame ("", `ReplacePoint(`id(`tabContents), `Empty ())) - ); - } - - term contents = tabs_term; - - // generate the term of password policy tab and update the help text - void set_password_policies_term () { - integer pwdcheckquality = tointeger (ppolicy["pwdCheckQuality"]:"0"); - term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( - `VSpacing (0.8), - `IntField (`id ("pwdInHistory"), - // IntField label - _("Ma&ximum Number of Passwords Stored in History"), - 0, max, tointeger (ppolicy["pwdInHistory"]:"0")), - `VSpacing (0.4), - `Left (`CheckBox (`id ("pwdMustChange"), - // checkbox label - _("U&ser Must Change Password after Reset"), - ppolicy["pwdMustChange"]:true)), - `VSpacing (0.2), - `Left (`CheckBox (`id ("pwdAllowUserChange"), - // checkbox label - _("&User Can Change Password"), - ppolicy["pwdAllowUserChange"]:true)), - `VSpacing (0.2), - `Left (`CheckBox (`id ("pwdSafeModify"), - // checkbox label - _("&Old Password Required for Password Change"), - ppolicy["pwdSafeModify"]:false)), - `VSpacing (0.4), - // frame label - `HBox (`HSpacing (2), `Frame (_("Password Quality Checking"), `VBox( - `VSpacing (0.5), - `RadioButtonGroup (`id("pwdCheckQuality"), `VBox ( - `Left (`RadioButton (`id(0), `opt (`notify), - _("&No Checking"), pwdcheckquality == 0)), - `Left (`RadioButton(`id(1), `opt (`notify), - _("Acc&ept Uncheckable Passwords"), - pwdcheckquality == 1)), - `Left (`RadioButton(`id(2), `opt (`notify), - _("&Only Accept Checked Passwords"), - pwdcheckquality == 2)) - )), - `VSpacing (0.4), - // IntField label - `IntField (`id ("pwdMinLength"), _("&Minimum Password Length"), - 0, max, tointeger (ppolicy["pwdMinLength"]:"0")) - ))) - ), `HSpacing (0.5))); - - UI::ReplaceWidget (`tabContents, tab_cont); - UI::ChangeWidget (`id ("pwdMinLength"), `Enabled, pwdcheckquality > 0); - return; - } - - term time_dialog (string id, string label) { - - integer value = tointeger (ppolicy[id]:"0"); - integer days = value / (24*60*60); - if (days > 0) value = value - (days * 24*60*60); - integer hours = value / (60*60); - if (hours > 0) value = value - (hours * 60*60); - integer minutes = value / 60; - if (minutes > 0) value = value - (minutes * 60); - return `HBox (`HSpacing (0.3), `Frame (label, `HBox ( - `IntField (`id (id + "d"), _("Days"), 0, max, days), - `IntField (`id (id + "h"), _("Hours"), 0, 23, hours), - `IntField (`id (id + "m"), _("Minutes"), 0, 59, minutes), - `IntField (`id (id + "s"), _("Seconds"), 0, 59, value) - )), `HSpacing (0.3)); - } - - integer get_seconds_value (string attr) { - - integer days = (integer) UI::QueryWidget (`id (attr + "d"), `Value); - integer hours = (integer) UI::QueryWidget (`id (attr + "h"), `Value); - integer minutes = (integer) UI::QueryWidget (`id (attr + "m"), `Value); - integer seconds = (integer) UI::QueryWidget (`id (attr + "s"), `Value); - return (days * 24*60*60) + (hours * 60*60) + (minutes *60) + seconds; - } - - // generate the term of password aging tab - void set_aging_policies_term () { - - term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( - `VSpacing (0.7), - // frame label - time_dialog ("pwdMinAge", _("Minimum Password Age")), - `VSpacing (0.4), - // frame label - time_dialog ("pwdMaxAge", _("Maximum Password Age")), - `VSpacing (0.4), - time_dialog ("pwdExpireWarning", - // frame label - _("Time before Password Expiration to Issue Warning")), - `VSpacing (0.2), - `IntField (`id ("pwdGraceAuthNLimit"), - // IntField label - _("Allowed Use of an Expired Password"), 0, max, - tointeger (ppolicy["pwdGraceAuthNLimit"]:"0") - ) - ), `HSpacing (0.5))); - UI::ReplaceWidget (`tabContents, tab_cont); - return; - } - - // generate the term of lockout aging tab - void set_lockout_policies_term () { - - boolean pwdlockout = ppolicy["pwdLockout"]:false; - - term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( - `VSpacing (0.8), - `Left (`CheckBox (`id ("pwdLockout"), `opt (`notify), - // check box label - _("Enable Password Locking"), - pwdlockout)), - `VSpacing (0.4), - `IntField (`id ("pwdMaxFailure"), - // intField label - _("Bind Failures to Lock the Password"), - 0, max, tointeger (ppolicy["pwdMaxFailure"]:"0")), - // frame label - time_dialog ("pwdLockoutDuration", _("Password Lock Duration")), - `VSpacing (0.4), - time_dialog ("pwdFailureCountInterval", - // frame label - _("Bind Failures Cache Duration")) - ), `HSpacing (0.5))); - - UI::ReplaceWidget (`tabContents, tab_cont); - UI::ChangeWidget (`id ("pwdMaxFailure"), `Enabled, pwdlockout); - foreach (string suffix, [ "d", "h", "m", "s" ], { - UI::ChangeWidget (`id ("pwdLockoutDuration" + suffix), - `Enabled, pwdlockout); - UI::ChangeWidget (`id ("pwdFailureCountInterval" + suffix), - `Enabled, pwdlockout); - }); - return; - } - - symbol current_tab = `pwchange; - any result = nil; - - Wizard::OpenNextBackDialog (); - - // dialog label - Wizard::SetContentsButtons (_("Password Policy Configuration"), contents, - help_text + tabs_help_text[current_tab]:"", - Label::CancelButton(), Label::OKButton()); - Wizard::HideAbortButton(); - - set_password_policies_term (); - - while (true) - { - result = UI::UserInput (); - - if (is(result,symbol) && - contains ([`back, `cancel, `abort], (symbol)result)) - break; - - // save the values from UI - foreach (string attr, attributes[current_tab]:[], { - if (contains (time_attributes, attr)) - { - ppolicy[attr] = sformat ("%1", get_seconds_value (attr)); - return; - } - any val = UI::QueryWidget (`id (attr), `Value); - if (is (val, integer)) - val = sformat ("%1", val); - ppolicy[attr] = val; - }); - - if ((result == `pwchange || result == `aging || result == `lockout) && - result!= current_tab) - { - if (result == `pwchange) - set_password_policies_term (); - else if (result == `aging) - set_aging_policies_term (); - else if (result == `lockout) - set_lockout_policies_term (); - current_tab = (symbol) result; - if (has_tabs) - UI::ChangeWidget (`id (`tabs), `CurrentItem, current_tab); - Wizard::SetHelpText (help_text + tabs_help_text[current_tab]:""); - continue; - } - if (result == `next) - { - boolean cont = false; - - // check the template required attributes... - foreach (string oc, ppolicy["objectClass"]:[], ``{ - if (cont) return; - foreach (string attr, Ldap::GetRequiredAttributes (oc), ``{ - any val = ppolicy[attr]:nil; - if (!cont && val == nil || val == [] || val == "") { - //error popup, %1 is attribute name - Popup::Error (sformat (_("The \"%1\" attribute is mandatory. -Enter a value."), attr)); - UI::SetFocus (`id(`table)); - cont = true; - } - }); - }); - if (cont) continue; - break; - } - // now solve events inside the tabs - if (current_tab == `pwchange && is (result, integer)) - { - UI::ChangeWidget (`id ("pwdMinLength"), `Enabled, result != 0); - } - if (current_tab == `lockout && result == "pwdLockout") - { - boolean pwdlockout = (boolean) UI::QueryWidget (`id ("pwdLockout"), `Value); - UI::ChangeWidget (`id ("pwdMaxFailure"), `Enabled, pwdlockout); - foreach (string suffix, [ "d", "h", "m", "s" ], { - UI::ChangeWidget (`id ("pwdFailureCountInterval" + suffix), - `Enabled, pwdlockout); - UI::ChangeWidget (`id ("pwdLockoutDuration" + suffix), - `Enabled, pwdlockout); - }); - } - } - Wizard::CloseDialog (); - - map<string,any> ret = $[]; - if (result == `next) - { - foreach (string key, any val, (map<string,any>) ppolicy, { - if (!haskey (ppolicy_orig, key) && - (val == default_values[key]:nil || val == "0")) - return; - if (val != ppolicy_orig[key]:nil) - { - if (is (val, boolean)) - val = (val == true) ? "TRUE" : "FALSE"; - ret[key] = val; - } - }); - } - return (result == `next) ? ret : nil; -} - }//EOF Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Tue Feb 21 11:26:43 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 21 11:25:21 CET 2012 - jsuchome(a)suse.cz + +- password policy popup moved here from ldap-client module + (fate#313143) + +------------------------------------------------------------------- Wed Dec 7 10:05:50 UTC 2011 - coolo(a)suse.com - fix license to be in spdx.org format Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp… ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Tue Feb 21 11:26:43 2012 @@ -9,7 +9,9 @@ import "Sequencer"; import "String"; import "Wizard"; - include "helps.ycp"; + + include "ldap-server/helps.ycp"; + include "ldap-server/widgets.ycp"; map <string, any> baseDb = $[ "rootdn" : "cn=Administrator", "directory" : "/var/lib/ldap" ]; @@ -557,7 +559,7 @@ } } } - map ppolicyEntry_new = LdapPopup::PasswordPolicyDialog(ppolicyEntry); + map ppolicyEntry_new = PasswordPolicyDialog(ppolicyEntry); // PasswordPolicyDialog only returns the changes made to the original // Entry, try to merge them here foreach ( string key, any val, (map<string,any>) ppolicyEntry_new, Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Tue Feb 21 11:26:43 2012 @@ -3,7 +3,9 @@ textdomain "ldap-server"; import "CWMFirewallInterfaces"; import "Label"; + import "Ldap"; import "Popup"; + import "Wizard"; map<string, any> firewall_settings = $[ "services": [ "service:openldap" ], @@ -493,4 +495,372 @@ return retval; } +/** + * dialog for Password Policy configuration object + * @param ppolicy data with Password Policy object to be edited (as obtained from LDAP search) + * @return map with modifications of ppolicy object, nil in case of `cancel + */ +define map PasswordPolicyDialog (map ppolicy) { + + // reduce the list values to single ones + ppolicy = mapmap (string a, any val, (map<string,any>)ppolicy, { + if (is (val, list) && (Ldap::SingleValued (a) || size ((list)val) == 1)) + val = ((list)val)[0]:nil; + if (val == "TRUE" || val == "FALSE") + val = (val == "TRUE"); + return $[ a: val ]; + }); + map ppolicy_orig = ppolicy; + + // help text for Password Policy Dialog + string help_text = _("Select the Password Change Policies, Password Aging Policies, and Lockout Policies tabs to choose LDAP password policy groups of attributes to configure."); + + + // tab-specific help texts + map tabs_help_text = $[ + // help text for pwdInHistory attribute + `pwchange : _("Specify the Maximum Number of Passwords Stored in History to set how many previously used passwords should be saved. Saved passwords may not be used.") + + + // help text for pwdMustChange attribute + _("Check User Must Change Password after Reset to force users to change their passwords after the password is reset or changed by an administrator.") + + + // help text for pwdAllowUserChange attribute + _("Check User Can Change Password to allow users to change their passwords.") + + + // help text for pwdSafeModify attribute + _("If the existing password must be provided along with the new password, check Old Password Required for Password Change.") + + + // help text for pwdCheckQuality attribute + _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be evaluated. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user provides an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + + + // help text for pwdMinLength attribute + _("Set the minimum number of characters that must be used in a password in Minimum Password Length."), + + // help text for pwdMinAge attribute + `aging : _("Minimum Password Age sets how much time must pass between modifications to the password.") + + + // help text for pwdMaxAge attribute + _("Maximum Password Age sets how long after modification a password expires.") + + + // help text for pwdExpireWarning attribute + _("In Time before Password Expiration to Issue Warning specify how long\nbefore expiration an authenticating user should be warned.") + + + // help text for pwdGraceAuthNLimit attribute + _("Set the number of times an expired password can be used to authenticate in Allowed Uses of an Expired Password."), + + // help text for pwdLockout attribute + `lockout : _("Check Enable Password Locking to forbid use of a password after a specified number of consecutive failed bind attempts.") + + + // help text for pwdMaxFailure attribute + _("Set the number of consecutive failed bind attempts after which the password may not be used to authenticate in Bind Failures to Lock the Password.") + + + // help text for pwdLockoutDuration attribute + _("Set for how long the password cannot be used in Password Lock Duration.") + + + // help text for pwdFailureCountInterval attribute + _("Bind Failures Cache Duration specifies the time after which password failures are purged from the failure counter even if no successful authentication has occurred."), + ]; + + // map of attribute names for each tab + map attributes = $[ + `pwchange : [ + "pwdInHistory", "pwdMustChange", "pwdAllowUserChange", + "pwdSafeModify", "pwdCheckQuality", "pwdMinLength" + ], + `aging : [ + "pwdMinAge", "pwdMaxAge", "pwdExpireWarning", "pwdGraceAuthNLimit" + ], + `lockout : [ + "pwdLockout", "pwdLockoutDuration", "pwdMaxFailure", + "pwdFailureCountInterval" + ], + ]; + + list time_attributes = [ + "pwdMinAge", "pwdMaxAge", "pwdExpireWarning", "pwdLockoutDuration", + "pwdFailureCountInterval" + ]; + + map default_values = $[ + "pwdMustChange" : false, + "pwdAllowUserChange" : true, + "pwdSafeModify" : false, + "pwdLockout" : false, + ]; + + // maximal value of IntFields + integer max = 99999; + + list<term> tabs = [ + // tab label + `item(`id(`pwchange), _("&Password Change Policies"), true), + // tab label + `item(`id(`aging), _("Pa&ssword Aging Policies")), + // tab label + `item(`id(`lockout), _("&Lockout Policies")), + ]; + term tabs_term = `VBox ( + `DumbTab (`id(`tabs), tabs, + `ReplacePoint(`id(`tabContents ), `VBox (`Empty ()))) + ); + boolean has_tabs = true; + if (!UI::HasSpecialWidget (`DumbTab)) + { + has_tabs = false; + term tabbar = `HBox (); + foreach (term it, tabs, { + string label = it[1]:""; + tabbar = add (tabbar,`PushButton (it[0]:`id(label), label)); + }); + tabs_term = `VBox (`Left(tabbar), + `Frame ("", `ReplacePoint(`id(`tabContents), `Empty ())) + ); + } + + term contents = tabs_term; + + // generate the term of password policy tab and update the help text + void set_password_policies_term () { + integer pwdcheckquality = tointeger (ppolicy["pwdCheckQuality"]:"0"); + term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( + `VSpacing (0.8), + `IntField (`id ("pwdInHistory"), + // IntField label + _("Ma&ximum Number of Passwords Stored in History"), + 0, max, tointeger (ppolicy["pwdInHistory"]:"0")), + `VSpacing (0.4), + `Left (`CheckBox (`id ("pwdMustChange"), + // checkbox label + _("U&ser Must Change Password after Reset"), + ppolicy["pwdMustChange"]:true)), + `VSpacing (0.2), + `Left (`CheckBox (`id ("pwdAllowUserChange"), + // checkbox label + _("&User Can Change Password"), + ppolicy["pwdAllowUserChange"]:true)), + `VSpacing (0.2), + `Left (`CheckBox (`id ("pwdSafeModify"), + // checkbox label + _("&Old Password Required for Password Change"), + ppolicy["pwdSafeModify"]:false)), + `VSpacing (0.4), + // frame label + `HBox (`HSpacing (2), `Frame (_("Password Quality Checking"), `VBox( + `VSpacing (0.5), + `RadioButtonGroup (`id("pwdCheckQuality"), `VBox ( + `Left (`RadioButton (`id(0), `opt (`notify), + _("&No Checking"), pwdcheckquality == 0)), + `Left (`RadioButton(`id(1), `opt (`notify), + _("Acc&ept Uncheckable Passwords"), + pwdcheckquality == 1)), + `Left (`RadioButton(`id(2), `opt (`notify), + _("&Only Accept Checked Passwords"), + pwdcheckquality == 2)) + )), + `VSpacing (0.4), + // IntField label + `IntField (`id ("pwdMinLength"), _("&Minimum Password Length"), + 0, max, tointeger (ppolicy["pwdMinLength"]:"0")) + ))) + ), `HSpacing (0.5))); + + UI::ReplaceWidget (`tabContents, tab_cont); + UI::ChangeWidget (`id ("pwdMinLength"), `Enabled, pwdcheckquality > 0); + return; + } + + term time_dialog (string id, string label) { + + integer value = tointeger (ppolicy[id]:"0"); + integer days = value / (24*60*60); + if (days > 0) value = value - (days * 24*60*60); + integer hours = value / (60*60); + if (hours > 0) value = value - (hours * 60*60); + integer minutes = value / 60; + if (minutes > 0) value = value - (minutes * 60); + return `HBox (`HSpacing (0.3), `Frame (label, `HBox ( + `IntField (`id (id + "d"), _("Days"), 0, max, days), + `IntField (`id (id + "h"), _("Hours"), 0, 23, hours), + `IntField (`id (id + "m"), _("Minutes"), 0, 59, minutes), + `IntField (`id (id + "s"), _("Seconds"), 0, 59, value) + )), `HSpacing (0.3)); + } + + integer get_seconds_value (string attr) { + + integer days = (integer) UI::QueryWidget (`id (attr + "d"), `Value); + integer hours = (integer) UI::QueryWidget (`id (attr + "h"), `Value); + integer minutes = (integer) UI::QueryWidget (`id (attr + "m"), `Value); + integer seconds = (integer) UI::QueryWidget (`id (attr + "s"), `Value); + return (days * 24*60*60) + (hours * 60*60) + (minutes *60) + seconds; + } + + // generate the term of password aging tab + void set_aging_policies_term () { + + term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( + `VSpacing (0.7), + // frame label + time_dialog ("pwdMinAge", _("Minimum Password Age")), + `VSpacing (0.4), + // frame label + time_dialog ("pwdMaxAge", _("Maximum Password Age")), + `VSpacing (0.4), + time_dialog ("pwdExpireWarning", + // frame label + _("Time before Password Expiration to Issue Warning")), + `VSpacing (0.2), + `IntField (`id ("pwdGraceAuthNLimit"), + // IntField label + _("Allowed Use of an Expired Password"), 0, max, + tointeger (ppolicy["pwdGraceAuthNLimit"]:"0") + ) + ), `HSpacing (0.5))); + UI::ReplaceWidget (`tabContents, tab_cont); + return; + } + + // generate the term of lockout aging tab + void set_lockout_policies_term () { + + boolean pwdlockout = ppolicy["pwdLockout"]:false; + + term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( + `VSpacing (0.8), + `Left (`CheckBox (`id ("pwdLockout"), `opt (`notify), + // check box label + _("Enable Password Locking"), + pwdlockout)), + `VSpacing (0.4), + `IntField (`id ("pwdMaxFailure"), + // intField label + _("Bind Failures to Lock the Password"), + 0, max, tointeger (ppolicy["pwdMaxFailure"]:"0")), + // frame label + time_dialog ("pwdLockoutDuration", _("Password Lock Duration")), + `VSpacing (0.4), + time_dialog ("pwdFailureCountInterval", + // frame label + _("Bind Failures Cache Duration")) + ), `HSpacing (0.5))); + + UI::ReplaceWidget (`tabContents, tab_cont); + UI::ChangeWidget (`id ("pwdMaxFailure"), `Enabled, pwdlockout); + foreach (string suffix, [ "d", "h", "m", "s" ], { + UI::ChangeWidget (`id ("pwdLockoutDuration" + suffix), + `Enabled, pwdlockout); + UI::ChangeWidget (`id ("pwdFailureCountInterval" + suffix), + `Enabled, pwdlockout); + }); + return; + } + + symbol current_tab = `pwchange; + any result = nil; + + Wizard::OpenNextBackDialog (); + + // dialog label + Wizard::SetContentsButtons (_("Password Policy Configuration"), contents, + help_text + tabs_help_text[current_tab]:"", + Label::CancelButton(), Label::OKButton()); + Wizard::HideAbortButton(); + + set_password_policies_term (); + + while (true) + { + result = UI::UserInput (); + + if (is(result,symbol) && + contains ([`back, `cancel, `abort], (symbol)result)) + break; + + // save the values from UI + foreach (string attr, attributes[current_tab]:[], { + if (contains (time_attributes, attr)) + { + ppolicy[attr] = sformat ("%1", get_seconds_value (attr)); + return; + } + any val = UI::QueryWidget (`id (attr), `Value); + if (is (val, integer)) + val = sformat ("%1", val); + ppolicy[attr] = val; + }); + + if ((result == `pwchange || result == `aging || result == `lockout) && + result!= current_tab) + { + if (result == `pwchange) + set_password_policies_term (); + else if (result == `aging) + set_aging_policies_term (); + else if (result == `lockout) + set_lockout_policies_term (); + current_tab = (symbol) result; + if (has_tabs) + UI::ChangeWidget (`id (`tabs), `CurrentItem, current_tab); + Wizard::SetHelpText (help_text + tabs_help_text[current_tab]:""); + continue; + } + if (result == `next) + { + boolean cont = false; + + // check the template required attributes... + foreach (string oc, ppolicy["objectClass"]:[], ``{ + if (cont) return; + foreach (string attr, Ldap::GetRequiredAttributes (oc), ``{ + any val = ppolicy[attr]:nil; + if (!cont && val == nil || val == [] || val == "") { + //error popup, %1 is attribute name + Popup::Error (sformat (_("The \"%1\" attribute is mandatory. +Enter a value."), attr)); + UI::SetFocus (`id(`table)); + cont = true; + } + }); + }); + if (cont) continue; + break; + } + // now solve events inside the tabs + if (current_tab == `pwchange && is (result, integer)) + { + UI::ChangeWidget (`id ("pwdMinLength"), `Enabled, result != 0); + } + if (current_tab == `lockout && result == "pwdLockout") + { + boolean pwdlockout = (boolean) UI::QueryWidget (`id ("pwdLockout"), `Value); + UI::ChangeWidget (`id ("pwdMaxFailure"), `Enabled, pwdlockout); + foreach (string suffix, [ "d", "h", "m", "s" ], { + UI::ChangeWidget (`id ("pwdFailureCountInterval" + suffix), + `Enabled, pwdlockout); + UI::ChangeWidget (`id ("pwdLockoutDuration" + suffix), + `Enabled, pwdlockout); + }); + } + } + Wizard::CloseDialog (); + + map<string,any> ret = $[]; + if (result == `next) + { + foreach (string key, any val, (map<string,any>) ppolicy, { + if (!haskey (ppolicy_orig, key) && + (val == default_values[key]:nil || val == "0")) + return; + if (val != ppolicy_orig[key]:nil) + { + if (is (val, boolean)) + val = (val == true) ? "TRUE" : "FALSE"; + ret[key] = val; + } + }); + } + return (result == `next) ? ret : nil; +} + + } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67491 - in /trunk/ldap-client/src: Ldap.ycp ui.ycp
by jsuchome＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: jsuchome Date: Tue Feb 21 11:06:24 2012 New Revision: 67491 URL: http://svn.opensuse.org/viewcvs/yast?rev=67491&view=rev Log: remove password policies configuration from the client (fate#313143) Modified: trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=674… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Tue Feb 21 11:06:24 2012 @@ -312,9 +312,6 @@ */ global boolean mkhomedir = false; - // map with modifications of Password Policies objects - global map<string,map> ppolicies = $[]; - // packages needed for pam_ldap/nss_ldap configuration global list<string> pam_nss_packages = ["pam_ldap", "nss_ldap"]; @@ -3035,12 +3032,6 @@ ldap_modified = false; } } - if (ppolicies != $[]) - { - WriteLDAP (ppolicies); - modified = true; // so data get reset in next step - ppolicies = $[]; - } // final stage Progress::NextStage (); Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=67491… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Tue Feb 21 11:06:24 2012 @@ -55,7 +55,7 @@ define boolean Modified () ``{ - return (Ldap::modified || Ldap::ldap_modified || Ldap::ppolicies != $[]); + return (Ldap::modified || Ldap::ldap_modified); } /** @@ -786,14 +786,6 @@ check the appropriate option. Changing this value does not cause any direct action. It is only information for the YaST users module, which manages user home directories. -") + - - // password policy help text caption - _("Password Policy") + - - // password policy help - _("Configure the selected password policy with Edit. Use Add to -add a new password policy. Password policies must be enabled on the LDAP server. ") ]; @@ -847,64 +839,6 @@ "rfc2307bis" ]; - list ppolicy_list = []; - - boolean ppolicies_enabled = false; - map<string,map> ppolicies = $[]; - map<string,map> ppolicies_orig= $[]; - list<string> ppolicies_deleted = []; // list of DN - - // read the list of pwdpolicy objects under base_config_dn - void read_ppolicies () { - - if (base_dn == "") return; - - if (Ldap::ldap_initialized && Ldap::tls_when_initialized != Ldap::ldap_tls) - { - Ldap::LDAPClose (); - } - - if (Ldap::ldap_initialized || Ldap::LDAPInit () == "") - { - ppolicies_enabled = (boolean) SCR::Execute (.ldap.ppolicy, $[ - "hostname" : Ldap::GetFirstServer (Ldap::server), - "bind_dn" : Ldap::GetBaseDN () - ]); - - list schemas = (list)SCR::Read (.ldap.search, $[ - "base_dn": "", - "attrs": [ "subschemaSubentry" ], - "scope": 0, - ]); - string schema_dn = schemas[0,"subschemaSubentry",0]:""; - if (schemas != nil && schema_dn != "" && - SCR::Execute (.ldap.schema, $[ "schema_dn": schema_dn ])== true) - { - map<string,map> pp = (map<string,map>) SCR::Read (.ldap.search, - $[ - "base_dn" : base_dn, - "filter" : "objectClass=pwdPolicy", - "scope" : 2, - "map" : true, - "not_found_ok" : true - ]); - if (pp != nil) - { - ppolicies = pp; - ppolicies_orig = ppolicies; - } - } - } - // TODO re-read is not supported, is it correct? - foreach (string dn, map ppolicy, Ldap::ppolicies, { - if (ppolicy["modified"]:"" == "deleted" && haskey (ppolicies, dn)) - ppolicies = remove (ppolicies, dn); - else if (ppolicy["modified"]:"" == "added") - ppolicies[dn] = ppolicy; - else ppolicies[dn] = union (ppolicies[dn]:$[], ppolicy); - }); - } - list<term> tabs = [ // tab label `item(`id(`client), _("C&lient Settings"), true), @@ -1026,19 +960,7 @@ `Right (`PushButton (`id(`configure), // pushbutton label _("Configure User Management &Settings..."))), - `VSpacing (), - `Table (`id (`ppolicy_table), `opt(`notify), `header ( - // table header - _("Password Policy")), - maplist (string dn, map pp, ppolicies, ``(`item (`id (dn), dn))) - ), - `HBox ( - `PushButton (`id (`add), Label::AddButton ()), - `PushButton (`id (`edit), Label::EditButton ()), - `PushButton (`id (`delete), Label::DeleteButton ()), - `HStretch () - ), - `VSpacing(0.4) + `VStretch () ), `HSpacing (4)); UI::ReplaceWidget (`tabContents, cont); @@ -1049,9 +971,6 @@ if (Mode::config ()) UI::ChangeWidget (`id(`configure), `Enabled, false); - foreach (symbol s, [ `ppolicy_table, `add, `edit, `delete ], { - UI::ChangeWidget (`id (s), `Enabled, ppolicies_enabled); - }); } @@ -1065,7 +984,6 @@ symbol current = `client; set_client_term (); - read_ppolicies (); while (true) { @@ -1146,105 +1064,6 @@ UI::ChangeWidget (`id (`krb5_realm), `Enabled, sssd_with_krb); UI::ChangeWidget (`id (`krb5_kdcip), `Enabled, sssd_with_krb); } - if (result == `add) - { - string suffix = base_dn; - UI::OpenDialog ( `opt(`decorated), `HBox( - `HSpacing(1), - `VBox( - // InputField label - `InputField (`id (`cn), `opt (`hstretch), - _("Name of Password Policy Object")), - `ReplacePoint (`id (`rp_suf), `HBox ( - // text label,suffix will follow in next label - `Label (`id (`suffix_label), _("Suffix:")), - `Label (`id (`suffix), base_dn), - // pushbutton label - `PushButton (`id (`br_suf), _("Change Suffix")) - )), - `ButtonBox ( - `PushButton(`id(`ok),`opt(`default,`key_F10),Label::OKButton()), - `PushButton(`id(`cancel),`opt (`key_F9), Label::CancelButton()) - ) - ), - `HSpacing(1) - )); - UI::SetFocus (`id (`cn)); - any ret = nil; - string new_dn = ""; - while (true) - { - ret = UI::UserInput (); - if (ret == `cancel) - break; - if (ret == `br_suf) - { - string suf = LdapPopup::InitAndBrowseTree (base_dn, $[ - "hostname" : Ldap::GetFirstServer (Ldap::server), - "port" : Ldap::GetFirstPort (Ldap::server), - "use_tls" : Ldap::ldap_tls ? "yes" : "no", - "cacertdir" : Ldap::tls_cacertdir, - "cacertfile" : Ldap::tls_cacertfile - ]); - if (suf != "") - UI::ReplaceWidget (`id (`rp_suf), `HBox ( - // text label,suffix will follow in next label - `Label (`id (`suffix_label), _("Suffix:")), - `Label (`id (`suffix), suf), - // pushbutton label - `PushButton (`id (`br_suf), _("Change Suffix")) - )); - } - if (ret == `ok) - { - string cn = (string) UI::QueryWidget (`id (`cn), `Value); - if (cn == "") break; - string suffix = (string) UI::QueryWidget (`id (`suffix), `Value); - new_dn = sformat ("cn=%1,%2", cn, suffix); - if (haskey (ppolicies, new_dn)) - { - Popup::Error (sformat (_("The Policy \'%1\' already exists. -Please select another one."), new_dn)); - continue; - } - break; - } - } - UI::CloseDialog (); - if (ret == `ok && new_dn != "") - { - map new = LdapPopup::PasswordPolicyDialog ($["dn": new_dn ]); - if (new != nil) - { - ppolicies[new_dn] = new; - UI::ChangeWidget (`id (`ppolicy_table), `Items, - maplist (string dn, map pp, ppolicies, ``(`item (`id (dn), dn))) - ); - UI::ChangeWidget (`id (`edit), `Enabled, size (ppolicies) > 0); - UI::ChangeWidget (`id (`delete), `Enabled, size (ppolicies) > 0); - } - } - } - if (result == `edit || result == `ppolicy_table) - { - string dn = (string) UI::QueryWidget (`id (`ppolicy_table), `CurrentItem); - map changes = LdapPopup::PasswordPolicyDialog (ppolicies[dn]:$[]); - if (changes != nil) - { - ppolicies[dn] = union (ppolicies[dn]:$[], changes); - } - } - if (result == `delete) - { - string dn = (string) UI::QueryWidget (`id (`ppolicy_table), `CurrentItem); - ppolicies = remove (ppolicies, dn); - ppolicies_deleted = (list<string>) union (ppolicies_deleted, [dn]); - UI::ChangeWidget (`id (`ppolicy_table), `Items, - maplist (string dn, map pp, ppolicies, ``(`item (`id (dn), dn))) - ); - UI::ChangeWidget (`id (`edit), `Enabled, size (ppolicies) > 0); - UI::ChangeWidget (`id (`delete), `Enabled, size (ppolicies) > 0); - } if (result == `next || result == `configure) { @@ -1263,44 +1082,6 @@ UI::SetFocus (`id (`base_config_dn)); continue; } - foreach (string dn, map ppolicy, ppolicies, { - // new ppolicy - if (!haskey (ppolicies_orig, dn)) - { - ppolicy["modified"] = "added"; - ppolicy["pwdAttribute"] = "userPassword"; - ppolicy["objectClass"] = ["pwdPolicy", "namedObject"]; - ppolicy["cn"] = get_cn (dn); - Ldap::ppolicies[dn] = ppolicy; - - } - else - { - map pp = $[]; - foreach (string a, any val, (map<string,any>) ppolicy, { - if (val != ppolicies_orig[dn,a]:nil) - pp[a] = val; - }); - if (pp != $[]) - { - pp["modified"] = "edited"; - Ldap::ppolicies[dn] = pp; - } - } - }); - // deleted ppolicies - foreach (string dn, ppolicies_deleted, { - map pp = Ldap::ppolicies[dn]:$[]; - if (pp["modified"]:"" == "added") - { - Ldap::ppolicies = remove (Ldap::ppolicies, dn); - } - else if (haskey (ppolicies_orig, dn)) - { - pp["modified"] = "deleted"; - Ldap::ppolicies[dn] = pp; - } - }); if (krb5_realm == "" || krb5_kdcip == "" || !Ldap::sssd) sssd_with_krb = false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67490 - /trunk/s390/
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 10:50:59 2012 New Revision: 67490 URL: http://svn.opensuse.org/viewcvs/yast?rev=67490&view=rev Log: - updated ignore list Modified: trunk/s390/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67489 - in /trunk/s390/src: clients/dasd.ycp clients/dasd_auto.ycp clients/zfcp.ycp dasd/dialogs.ycp dasd/wizards.ycp modules/ZFCPController.ycp zfcp/dialogs.ycp zfcp/helps.ycp zfcp/wizards.ycp
by aschnell＠svn2.opensuse.org 20 Feb '12

20 Feb '12

Author: aschnell Date: Mon Feb 20 18:15:21 2012 New Revision: 67489 URL: http://svn.opensuse.org/viewcvs/yast?rev=67489&view=rev Log: - work on getting zfcp modules working with autoyast editor Modified: trunk/s390/src/clients/dasd.ycp trunk/s390/src/clients/dasd_auto.ycp trunk/s390/src/clients/zfcp.ycp trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/dasd/wizards.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp trunk/s390/src/zfcp/helps.ycp trunk/s390/src/zfcp/wizards.ycp Modified: trunk/s390/src/clients/dasd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd.ycp?rev=67… ============================================================================== --- trunk/s390/src/clients/dasd.ycp (original) +++ trunk/s390/src/clients/dasd.ycp Mon Feb 20 18:15:21 2012 @@ -8,16 +8,9 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("DASD module started"); @@ -29,7 +22,7 @@ include "s390/dasd/wizards.ycp"; map cmdline_description = $[ - "id" : "controller", + "id" : "DASD", // Command line help text for the Xcontroller module "help" : _("Configuration of DASD"), "guihandler" : DASDSequence, @@ -46,19 +39,11 @@ ] ]; - -/* main ui function */ -any ret = nil; - -ret = CommandLine::Run(cmdline_description); -//ret = DASDSequence (); +any ret = CommandLine::Run(cmdline_description); y2debug("ret=%1", ret); -/* Finish */ y2milestone("DASD module finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } Modified: trunk/s390/src/clients/dasd_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd_auto.ycp?r… ============================================================================== --- trunk/s390/src/clients/dasd_auto.ycp (original) +++ trunk/s390/src/clients/dasd_auto.ycp Mon Feb 20 18:15:21 2012 @@ -121,5 +121,4 @@ y2milestone("----------------------------------------"); return ret; - } Modified: trunk/s390/src/clients/zfcp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp.ycp?rev=67… ============================================================================== --- trunk/s390/src/clients/zfcp.ycp (original) +++ trunk/s390/src/clients/zfcp.ycp Mon Feb 20 18:15:21 2012 @@ -8,16 +8,9 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("ZFCP module started"); @@ -31,8 +24,8 @@ map cmdline_description = $[ "id" : "ZFCP", // Command line help text for the Xcontroller module - "help" : _("ZFCP configuration"), - "guihandler" : ZFCPSequence, //ControllerSequence, + "help" : _("Configuration of ZFCP"), + "guihandler" : ZFCPSequence, "initialize" : ZFCPController::Read, "finish" : ZFCPController::Write, "actions" : $[ @@ -46,20 +39,11 @@ ] ]; - -/* main ui function */ -any ret = nil; - -//ret = CommandLine::Run(cmdline_description); -//ret = ZFCPSequence (); -ret = CommandLine::Run(cmdline_description); +any ret = CommandLine::Run(cmdline_description); y2debug("ret=%1", ret); -/* Finish */ y2milestone("ZFCP module finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Mon Feb 20 18:15:21 2012 @@ -38,9 +38,9 @@ * Read settings dialog * @return `abort if aborted and `next otherwise */ -symbol ReadDialog() { +symbol ReadDialog() +{ Wizard::RestoreHelp(DASD_HELPS["read"]:""); - // Controller::AbortFunction = PollAbort; boolean ret = DASDController::Read(); return ret ? `next : `abort; } @@ -49,9 +49,9 @@ * Write settings dialog * @return `abort if aborted and `next otherwise */ -symbol WriteDialog() { +symbol WriteDialog() +{ Wizard::RestoreHelp(DASD_HELPS["write"]:""); - // Controller::AbortFunction = PollAbort; boolean ret = DASDController::Write(); return ret ? `next : `abort; } @@ -273,7 +273,7 @@ } foreach (integer id, selected, { - string channel = DASDController::devices[id,"channel"]:""; + string channel = DASDController::devices[id, "channel"]:""; boolean diag = DASDController::diag[channel]:false; DASDController::ActivateDisk(channel, diag); }); @@ -295,7 +295,7 @@ } foreach (integer id, selected, { - string channel = DASDController::devices[id,"channel"]:""; + string channel = DASDController::devices[id, "channel"]:""; boolean diag = DASDController::diag[channel]:false; DASDController::DeactivateDisk(channel, diag); }); @@ -461,12 +461,6 @@ */ symbol AddDASDDiskDialog() { - if (!Mode::config()) - { - y2error("DASD Add Disk dialog shouldn't be run in Mode::config()"); - return `back; - } - /* Minimal text for the help */ string help = DASD_HELPS["disk_add_config"]:""; @@ -559,12 +553,6 @@ */ symbol DeleteDASDDiskDialog() { - if (!Mode::config()) - { - y2error("DASD Delete Disk dialog shouldn't be run in Mode::config()"); - return `back; - } - list<integer> selected = ListSelectedDASD(); if (isempty(selected)) { Modified: trunk/s390/src/dasd/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/wizards.ycp (original) +++ trunk/s390/src/dasd/wizards.ycp Mon Feb 20 18:15:21 2012 @@ -42,7 +42,7 @@ "delete" : $[ `abort : `abort, `next : "main" - ], + ] ]; return Sequencer::Run(aliases, sequence); Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Mon Feb 20 18:15:21 2012 @@ -14,12 +14,10 @@ textdomain "s390"; import "Mode"; -import "Progress"; import "Report"; -import "Stage"; -import "Summary"; import "Popup"; + global map<integer,map<string,any> > devices = $[]; global string filter_min = "0.0.0000"; @@ -36,6 +34,7 @@ global void ProbeDisks(); global boolean GetModified(); + boolean disk_configured = false; /** @@ -136,39 +135,77 @@ } + global string GetNextLUN(string fcp_lun) + { + if (fcp_lun == nil || fcp_lun == "") + fcp_lun = "0"; + + integer old_lun = tointeger(fcp_lun); + integer new_lun = old_lun; + + foreach (integer k, map<string, any> v, devices, { + if (old_lun == tointeger(v["detail", "fcp_lun"]:"")) + { + if (v["vendor"]:"" == "IBM" && v["device"]:"" == "25f03") + new_lun = old_lun + 0x100000000; + else + new_lun = old_lun + 1; + } + }); + + return tohexstring(new_lun, 16); + } + + /** * Read all controller settings * @return true on success */ global boolean Read() { + ProbeDisks(); + disk_configured = false; return true; } + /** * Write all controller settings * @return true on success */ global boolean Write() { - if (disk_configured && Mode::normal ()) + if (!Mode::normal()) + { + foreach (integer index, map<string, any> device, devices, { + string channel = device["controller_id"]:""; + string wwpn = device["wwpn"]:""; + string lun = device["fcp_lun"]:""; + ActivateDisk(channel, wwpn, lun); + }); + } + + if (!Mode::installation()) { - // popup label - UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); + if (disk_configured) + { + // popup label + UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); - string command = "/sbin/mkinitrd && /sbin/zipl"; - y2milestone ("Running command %1", command); - any ret = SCR::Execute(.target.bash, command); - y2milestone("Exit code: %1", ret); + string command = "/sbin/mkinitrd && /sbin/zipl"; + y2milestone ("Running command %1", command); + any ret = SCR::Execute(.target.bash, command); + y2milestone("Exit code: %1", ret); - UI::CloseDialog(); + UI::CloseDialog(); + } } return true; - } + /** * Get all controller settings from the first parameter * (For use by autoinstallation.) @@ -177,12 +214,10 @@ */ global boolean Import(map settings) { - if (Mode::config ()) - { integer index = -1; devices = listmap (map d, settings["devices"]:[], { index = index + 1; - map<string,any> m = $[ + map<string, any> m = $[ "detail" : $[ "controller_id" : d["controller_id"]:"", "wwpn" : d["wwpn"]:"", @@ -191,16 +226,11 @@ ]; return $[ index : m ]; }); - } - else if (Stage::initial ()) - { - foreach (map d, settings["devices"]:[], { - ActivateDisk (d["controller_id"]:"", d["wwpn"]:"", d["fcp_lun"]:""); - }); - } + return true; } + /** * Dump the controller settings to a single map * (For use by autoinstallation.) @@ -208,19 +238,14 @@ */ global map Export() { -ProbeDisks(); - list<map<string,any> > l = maplist (integer k, map<string,any> v, - devices, - { + list<map<string, any> > l = maplist (integer k, map<string, any> v, devices, { return $[ - "controller_id" : v["detail","controller_id"]:"", - "wwpn" : v["detail","wwpn"]:"", - "fcp_lun" : v["detail","fcp_lun"]:"", - ]; - }); - return $[ - "devices" : l, - ]; + "controller_id" : v["detail", "controller_id"]:"", + "wwpn" : v["detail", "wwpn"]:"", + "fcp_lun" : v["detail", "fcp_lun"]:"", + ]; }); + + return $[ "devices" : l, ]; } @@ -359,9 +384,6 @@ */ global void ProbeDisks() { -/* if (Mode::config ()) - return;*/ - // popup label UI::OpenDialog(`Label(_("Reading Configured ZFCP Devices"))); @@ -379,6 +401,8 @@ return $[ index : d ]; }); + y2milestone("probed zfcps %1", devices); + UI::CloseDialog(); } Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Mon Feb 20 18:15:21 2012 @@ -20,13 +20,26 @@ include "s390/zfcp/helps.ycp"; + + /** + * List ZFCP devices that are currently being selected + * @return list<integer> list of IDs of selected ZFCP devices + */ + list<integer> ListSelectedZFCP() + { + list<integer> selected = (list<integer>) UI::QueryWidget(`id(`table), `SelectedItems); + y2milestone("selected %1", selected); + return selected; + } + + /** * Read settings dialog * @return `abort if aborted and `next otherwise */ -symbol ReadDialog() { +symbol ReadDialog() +{ Wizard::RestoreHelp(ZFCP_HELPS["read"]:""); - // Controller::AbortFunction = PollAbort; boolean ret = ZFCPController::Read(); return ret ? `next : `abort; } @@ -35,9 +48,9 @@ * Write settings dialog * @return `abort if aborted and `next otherwise */ -symbol WriteDialog() { +symbol WriteDialog() +{ Wizard::RestoreHelp(ZFCP_HELPS["write"]:""); - // Controller::AbortFunction = PollAbort; boolean ret = ZFCPController::Write(); return ret ? `next : `abort; } @@ -71,20 +84,6 @@ /** - * Restart the ZFCP-Dialog - */ -void ReloadZFCPDialog() -{ - ZFCPController::ProbeDisks(); - - list<term> items = GetZFCPDiskItems(); - - UI::ChangeWidget(`id(`table), `Items, items); - UI::ChangeWidget(`id(`delete), `Enabled, !isempty(items)); - UI::SetFocus(`table); -} - -/** * Show the ZFCP-Dialog */ void DisplayZFCPDialog() @@ -118,7 +117,7 @@ ) ), `HBox( - `Table(`id(`table), `opt(`notify), header, []) + `Table(`id(`table), `opt(`multiSelection), header, []) ), `HBox( `PushButton(`id(`add), Label::AddButton ()), @@ -127,8 +126,6 @@ ) ); - y2debug("Content: %1\n", content); - /* Apply the settings */ Wizard::SetContentsButtons(caption, content, help, Label::BackButton(), Label::NextButton()); Wizard::HideBackButton(); Wizard::SetAbortButton(`abort, Label::CancelButton() ); @@ -139,6 +136,20 @@ /** + * Restart the ZFCP-Dialog + */ +void ReloadZFCPDialog() +{ + list<term> items = GetZFCPDiskItems(); + + list<integer> selected = (list<integer>) UI::QueryWidget(`id(`table), `SelectedItems); + UI::ChangeWidget(`id(`table), `Items, items); + UI::ChangeWidget(`id(`table), `SelectedItems, selected); + UI::SetFocus(`table); +} + + +/** * Show the ZFCP-Dialog * @return symbol From the dialog */ @@ -147,15 +158,10 @@ DisplayZFCPDialog (); ReloadZFCPDialog (); - any ret = nil; - - integer selected = 0; - + symbol ret = nil; while (ret == nil) { - ret = UI::UserInput(); - - selected = (integer) UI::QueryWidget (`id (`table), `CurrentItem); + ret = (symbol) UI::UserInput(); if (ret == `filter) { @@ -177,6 +183,11 @@ ret = nil; continue; } + else if (ret == `table) + { + ret = nil; + continue; + } else if (ret == `abort || ret == `cancel) { // yes-no popup @@ -185,46 +196,14 @@ { ret = nil; } + continue; } - else if (ret == `delete) - { - map<string,any> descr = ZFCPController::devices[selected]:$[]; - string dev_name = (string)(descr["dev_name"]:""); - string channel = descr["detail", "controller_id"]:"unknown"; - string wwpn = descr["detail", "wwpn"]:"unknown"; - string fcp_lun = descr["detail", "fcp_lun"]:"unknown"; - - // popup qestion, %1 is device name (eg. /dev/sda) - if (! Popup::YesNo (sformat (_("Remove device %1?"), dev_name))) - { - ret = nil; - continue; - } - if (Mode::config ()) - { - ZFCPController::devices - = remove (ZFCPController::devices, selected); - } - else - { - ZFCPController::DeactivateDisk (channel, wwpn, fcp_lun); - } - ReloadZFCPDialog (); - ret = nil; - } - } - if (ret == `add) - { - map<string,any> descr = ZFCPController::devices[selected]:$[]; - string dev_name = (string)(descr["dev_name"]:""); - string channel = descr["controller_id"]:"unknown"; - string wwpn = descr["detail", "wwpn"]:"unknown"; - if (wwpn != "unknown") - ZFCPController::previous_settings["wwpn"] = wwpn; } - return (symbol) ret; + + return ret; } + /** * Add ZFCP-Dialog * @return symbol the dialog @@ -238,25 +217,9 @@ string caption = _("Add New ZFCP Device"); string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:""; - if (fcp_lun == nil || fcp_lun == "") - fcp_lun = "0"; - integer i_lun = tointeger (fcp_lun); - integer new_lun = i_lun; - - foreach (integer k, map<string,any> v, ZFCPController::devices, { - if (i_lun == tointeger (v["detail", "fcp_lun"]:"")) - { - if (v["vendor"]:"" == "IBM" && v["device"]:"" == "25f03") - new_lun = i_lun + tointeger ("0x100000000"); - else - new_lun = i_lun + 1; - } - }); - fcp_lun = tohexstring (new_lun); - if (fcp_lun != "") - fcp_lun = ZFCPController::HexNumSize (fcp_lun, 16); + fcp_lun = ZFCPController::GetNextLUN(fcp_lun); - list<string>items = []; + list<string> items = []; if (Mode::config ()) { items = maplist (integer index, map<string, any> d, ZFCPController::devices, { @@ -368,9 +331,10 @@ string channel = (string) UI::QueryWidget(`id(`channel), `Value); string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); string lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); - ZFCPController::previous_settings["wwpm"] = wwpn; - ZFCPController::previous_settings["fcp_lun"] = lun; + ZFCPController::previous_settings["channel"] = channel; + ZFCPController::previous_settings["wwpn"] = wwpn; + ZFCPController::previous_settings["fcp_lun"] = lun; if (Mode::config()) { @@ -393,4 +357,40 @@ return ret; } + +/** + * Run the dialog for deleting ZFCPs + * @return symbol from DeleteZFCPDiskDialog + */ +symbol DeleteZFCPDiskDialog() +{ + list<integer> selected = ListSelectedZFCP(); + if (isempty(selected)) + { + // error popup message + Popup::Message (_("No disk selected.")); + } + else + { + if (Mode::config()) + { + foreach(integer index, selected, { ZFCPController::RemoveDevice(index); }); + } + else + { + foreach(integer index, selected, { + map d = ZFCPController::devices[index]:$[]; + string channel = d["detail", "controller_id"]:"unknown"; + string wwpn = d["detail", "wwpn"]:"unknown"; + string fcp_lun = d["detail", "fcp_lun"]:"unknown"; + ZFCPController::DeactivateDisk(channel, wwpn, fcp_lun); + }); + + ZFCPController::ProbeDisks(); + } + } + + return `next; +} + } Modified: trunk/s390/src/zfcp/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/helps.ycp?rev=6748… ============================================================================== --- trunk/s390/src/zfcp/helps.ycp (original) +++ trunk/s390/src/zfcp/helps.ycp Mon Feb 20 18:15:21 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; /** @@ -74,5 +72,4 @@ ]; -/* EOF */ } Modified: trunk/s390/src/zfcp/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/wizards.ycp (original) +++ trunk/s390/src/zfcp/wizards.ycp Mon Feb 20 18:15:21 2012 @@ -23,7 +23,8 @@ { map aliases = $[ "main" : ``(ZFCPDialog()), - "add" : ``(AddZFCPDiskDialog()) + "add" : ``(AddZFCPDiskDialog()), + "delete" : ``(DeleteZFCPDiskDialog()) ]; map sequence = $[ @@ -31,12 +32,17 @@ "main" : $[ `abort : `abort, `next : `next, - `add : "add", + `add : "add", + `delete : "delete" ], "add" : $[ `abort : `abort, - `next : "main", + `next : "main" ], + "delete" : $[ + `abort : `abort, + `next : "main" + ] ]; return Sequencer::Run(aliases, sequence); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67488 - in /trunk/ncurses-pkg/src: NCPkgPackageDetails.cc NCPkgPackageDetails.h
by gs＠svn2.opensuse.org 20 Feb '12

20 Feb '12

Author: gs Date: Mon Feb 20 13:15:01 2012 New Revision: 67488 URL: http://svn.opensuse.org/viewcvs/yast?rev=67488&view=rev Log: improve displaying of patch description (add paragraphs) Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc trunk/ncurses-pkg/src/NCPkgPackageDetails.h Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Mon Feb 20 13:15:01 2012 @@ -264,6 +264,34 @@ } +string NCPkgPackageDetails::createHtmlParagraphs( string value ) +{ + NCstring input( value ); + NCtext descr( input ); + NCtext html_descr( NCstring( "" ) ); + string description = ""; + + list<NCstring>::const_iterator line; + + for ( line = descr.Text().begin(); line != descr.Text().end(); ++line ) + { + NCstring curr_line( *line ); + if ( curr_line.Str().empty() ) + html_descr.append( NCstring("") ); + else + html_descr.append( NCstring(" " + curr_line.Str()) ); + } + html_descr.append( NCstring("") ); + + for ( line = html_descr.Text().begin(); line != html_descr.Text().end(); ++line ) + { + NCstring curr_line( *line ); + description += curr_line.Str(); + } + + return description; +} + bool NCPkgPackageDetails::patchDescription( ZyppObj objPtr, ZyppSel selectable ) { ZyppPatch patchPtr = tryCastToZyppPatch( objPtr ); @@ -301,9 +329,9 @@ // get and format the patch description string value = patchPtr->description(); - descr += ""; - descr += value; - descr += ""; + yuiDebug() << "Patch description: " << value << endl; + + descr += createHtmlParagraphs( value ); descr += _("References: "); for ( Patch::ReferenceIterator rit = patchPtr->referencesBegin(); Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.h (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.h Mon Feb 20 13:15:01 2012 @@ -61,6 +61,8 @@ string createText( list <string> info, bool oneline ); + string createHtmlParagraphs( string description ); + string createRelLine( const zypp::Capabilities & info ); string commonHeader( ZyppObj pkgPtr ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0