June 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r48681 - in /trunk/ca-management/src: CaMgm.ycp ca_mgm_proposal.ycp new_cert_read_write.ycp util.ycp
by mcalmer＠svn.opensuse.org 30 Jun '08

30 Jun '08

Author: mcalmer Date: Mon Jun 30 17:45:21 2008 New Revision: 48681 URL: http://svn.opensuse.org/viewcvs/yast?rev=48681&view=rev Log: proposal: get all ip addresses of the system and try to resolve the hostname of them. Write IPs and Hostnames into SubjectAlternativeName. This hopefully make the created Certificate usable even if hostname --long returns the wrong hostname. Modified: trunk/ca-management/src/CaMgm.ycp trunk/ca-management/src/ca_mgm_proposal.ycp trunk/ca-management/src/new_cert_read_write.ycp trunk/ca-management/src/util.ycp Modified: trunk/ca-management/src/CaMgm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/CaMgm.ycp?rev=… ============================================================================== --- trunk/ca-management/src/CaMgm.ycp (original) +++ trunk/ca-management/src/CaMgm.ycp Mon Jun 30 17:45:21 2008 @@ -135,6 +135,7 @@ global string prop_state = ""; global symbol prop_selection = `def; // `none, `disk +global list<map> prop_subject_alt_name_list = []; global boolean adv_subject_alt_name_show_email = false; Modified: trunk/ca-management/src/ca_mgm_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/ca_mgm_proposa… ============================================================================== --- trunk/ca-management/src/ca_mgm_proposal.ycp (original) +++ trunk/ca-management/src/ca_mgm_proposal.ycp Mon Jun 30 17:45:21 2008 @@ -29,6 +29,7 @@ import "String"; include "ca-management/new_cert_read_write.ycp"; + include "ca-management/util.ycp"; string func = (string)WFM::Args(0); map param = (map)WFM::Args(1); @@ -41,7 +42,18 @@ string proposal = ""; string warning = nil; symbol warning_level = nil; - + + list<map> host_ips = getHostIPs (); + string hostname_bak = ""; + + foreach(map elem, host_ips, { + if(elem["kind"]:"" == "DNS") + { + hostname_bak = elem["name"]:""; + } + CaMgm::prop_subject_alt_name_list = add (CaMgm::prop_subject_alt_name_list, elem); + }); + map retmap = (map) SCR::Execute (.target.bash_output, "/bin/hostname --long", $[] ); @@ -52,8 +64,15 @@ || !CaMgm::prop_emailChanged || force_reset)) { - ret = add( ret, "warning", _("Cannot evaluate the name of the local machine. Change the values of Server Name and E-Mail.")); - ret = add( ret, "warning_level", `blocker ); + if(hostname_bak == "") + { + ret = add( ret, "warning", _("Cannot evaluate the name of the local machine. Change the values of Server Name and E-Mail.")); + ret = add( ret, "warning_level", `blocker ); + } + else + { + retmap["stdout"] = hostname_bak; + } } string longhostname = strip(retmap["stdout"]:"linux.site"); Modified: trunk/ca-management/src/new_cert_read_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/new_cert_read_… ============================================================================== --- trunk/ca-management/src/new_cert_read_write.ycp (original) +++ trunk/ca-management/src/new_cert_read_write.ycp Mon Jun 30 17:45:21 2008 @@ -757,6 +757,9 @@ param["certType"] = "server"; param["caPasswd"] = getPassword(CaMgm::currentCA); //param["notext"] = "1"; + foreach(map elem, CaMgm::prop_subject_alt_name_list, { + CaMgm::adv_subject_alt_name_list = add (CaMgm::adv_subject_alt_name_list, elem); + }); } if (kind == "Client Certificate") { Modified: trunk/ca-management/src/util.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/util.ycp?rev=4… ============================================================================== --- trunk/ca-management/src/util.ycp (original) +++ trunk/ca-management/src/util.ycp Mon Jun 30 17:45:21 2008 @@ -1425,7 +1425,65 @@ return success; } - + + define list<map> getHostIPs () ``{ + list<map> ret = []; + + list <string> ip_addresses = splitstring( + ((map<string, any>)SCR::Execute(.target.bash_output, "ip -f inet -o addr | awk '{print $4}' | awk -F \/ '{print $1}' | tr '\n' ','"))["stdout"]:"", ",") ; + + + foreach(string ip, ip_addresses, { + // skip localhost addresses + if(ip != "127.0.0.1" && ip != "127.0.0.2" && ip != "") + { + // add the IP address + map new_entry = $[]; + new_entry["kind"] = "IP"; + new_entry["name"] = ip; + + ret = add (ret, new_entry); + + // first ask the DNS server about the name for this IP address + list<string> hostnames = splitstring( + ((map<string,any>)SCR::Execute(.target.bash_output, sformat("dig +noall +answer -x %1 | awk '{print $5}' | sed 's/\.$//'| tr '\n' '|'", ip)))["stdout"]:"", "|"); + + boolean found = false; + foreach(string hname, hostnames, { + if(hname != "") + { + // add the names + found = true; + map new_entry = $[]; + new_entry["kind"] = "DNS"; + new_entry["name"] = hname; + + ret = add (ret, new_entry); + } + }); + // If not found, ask the hosts file about the IP address + if(!found) + { + list<string> hostnames = splitstring( + ((map<string,any>)SCR::Execute(.target.bash_output, sformat("getent hosts %1 | awk '{print $2}' | sed 's/\.$//'| tr '\n' '|'", ip)))["stdout"]:"", "|"); + + foreach(string hname, hostnames, { + if(hname != "") + { + // add the names + map new_entry = $[]; + new_entry["kind"] = "DNS"; + new_entry["name"] = hname; + + ret = add (ret, new_entry); + } + }); + } + } + }); + y2milestone("getHostIPs return: %1", ret); + 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] r48680 - /trunk/autoinstallation/doc/CreateProfileDetails.xml
by ug＠svn.opensuse.org 30 Jun '08

30 Jun '08

Author: ug Date: Mon Jun 30 10:11:52 2008 New Revision: 48680 URL: http://svn.opensuse.org/viewcvs/yast?rev=48680&view=rev Log: docu update Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Mon Jun 30 10:11:52 2008 @@ -2307,6 +2307,12 @@ specifying the final path on the installed system. &yast2; will copy this file to the specified location. </para> + <para> + This feature requires the autoyast2 package to be installed. If the package is + missing, AutoYaST will silently ignore the <emphasis>files</emphasis> section. + Since openSUSE 11.0 and SLES11 AutoYaST will install the package on it's own if + it's missing. + </para> &example.files; <para> -- 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] r48679 - in /trunk/autoinstallation: package/autoyast2.changes src/modules/Profile.ycp
by ug＠svn.opensuse.org 30 Jun '08

30 Jun '08

Author: ug Date: Mon Jun 30 10:08:18 2008 New Revision: 48679 URL: http://svn.opensuse.org/viewcvs/yast?rev=48679&view=rev Log: autoyast2 is installed when the profile has a <files ...> section Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/Profile.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Mon Jun 30 10:08:18 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jun 30 10:04:43 CEST 2008 - ug(a)suse.de + +- autoyast2 is installed when the profile has a <files ...> section + +------------------------------------------------------------------- Wed Jun 25 16:19:11 CEST 2008 - ug(a)suse.de - proposal selection possible via autoyast profile (fate#302946) Modified: trunk/autoinstallation/src/modules/Profile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Pro… ============================================================================== --- trunk/autoinstallation/src/modules/Profile.ycp (original) +++ trunk/autoinstallation/src/modules/Profile.ycp Mon Jun 30 10:08:18 2008 @@ -115,6 +115,8 @@ } else { current["software"] = $[ "packages":[ "autoyast2-installation" ] ]; } + if( haskey( current, "files" ) ) + current["software","packages"] = add( current["software","packages"]:[], "autoyast2" ); // without autoyast2, <files ...> does not work } /** -- 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] r48678 - in /trunk/gtk: ChangeLog src/yzypptags.cc src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 29 Jun '08

29 Jun '08

Author: rpmcruz Date: Mon Jun 30 01:57:33 2008 New Revision: 48678 URL: http://svn.opensuse.org/viewcvs/yast?rev=48678&view=rev Log: * src/yzypptags.cc: tweaked some icons as suggested by bug report 404818. Modified: trunk/gtk/ChangeLog trunk/gtk/src/yzypptags.cc trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=48678&r1=48677… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Jun 30 01:57:33 2008 @@ -1,3 +1,8 @@ +2008-06-30 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/yzypptags.cc: tweaked some icons as suggested by bug report + 404818. + 2008-06-27 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: bug fix 404382: was using always the label Modified: trunk/gtk/src/yzypptags.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzypptags.cc?rev=48678&r… ============================================================================== --- trunk/gtk/src/yzypptags.cc (original) +++ trunk/gtk/src/yzypptags.cc Mon Jun 30 01:57:33 2008 @@ -154,7 +154,7 @@ text = "package_network"; break; case PK_GROUP_ENUM_OFFICE: - text = "package_office_addressbook"; + text = "applications-office"; break; case PK_GROUP_ENUM_OTHER: text = "package_main"; @@ -166,7 +166,7 @@ text = "package_multimedia"; break; case PK_GROUP_ENUM_SYSTEM: - text = "yast-system"; + text = "applications-system"; break; case PK_GROUP_ENUM_DESKTOP_GNOME: text = "pattern-gnome"; @@ -175,10 +175,10 @@ text = "pattern-kde"; break; case PK_GROUP_ENUM_DESKTOP_XFCE: - text = "package_utility_desktop"; + text = "pattern-xfce"; break; case PK_GROUP_ENUM_DESKTOP_OTHER: - text = "package_utility_desktop"; + text = "user-desktop"; break; case PK_GROUP_ENUM_PUBLISHING: text = "package_main"; Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=4867… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Mon Jun 30 01:57:33 2008 @@ -1433,7 +1433,7 @@ { "Documentation", "package_documentation" }, { "Hardware", "package_settings_peripherals" }, { "Productivity", "package_applications" }, - { "System", "package_settings" }, + { "System", "applications-system" }, { "Multimedia", "package_multimedia" }, { "Video", "package_multimedia" }, { "Office", "applications-office" }, -- 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] r48677 - /tags/stable-2_17_1/http-server/
by mzugec＠svn.opensuse.org 29 Jun '08

29 Jun '08

Author: mzugec Date: Sun Jun 29 18:57:30 2008 New Revision: 48677 URL: http://svn.opensuse.org/viewcvs/yast?rev=48677&view=rev Log: Created tag stable-2_17_1 for http-server Added: tags/stable-2_17_1/http-server/ - copied from r48676, trunk/http-server/ -- 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] r48676 - in /trunk/http-server: VERSION package/yast2-http-server.changes src/helps.ycp
by mzugec＠svn.opensuse.org 29 Jun '08

29 Jun '08

Author: mzugec Date: Sun Jun 29 18:56:59 2008 New Revision: 48676 URL: http://svn.opensuse.org/viewcvs/yast?rev=48676&view=rev Log: fixed help text about IP-based vhost & SSL (bnc#383720) Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/helps.ycp Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=48676&r1… ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Sun Jun 29 18:56:59 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Sun Jun 29 18:56:59 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sun Jun 29 18:55:29 CEST 2008 - mzugec(a)suse.de + +- fixed help text about IP-based vhost & SSL (bnc#383720) +- 2.17.1 + +------------------------------------------------------------------- Fri Jun 20 16:01:18 CEST 2008 - mzugec(a)suse.de - enable/disable also modules with default=1 (bnc#399288) Modified: trunk/http-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/helps.ycp?rev=48… ============================================================================== --- trunk/http-server/src/helps.ycp (original) +++ trunk/http-server/src/helps.ycp Sun Jun 29 18:56:59 2008 @@ -119,7 +119,7 @@ + _("The Server Resolution options set the resolution when using virtual hosts. However, when you choose Resolution via HTTP Headers, the default server will never be served requests to the IP address of - a name-based virtual host."), + a name-based virtual host. If you plan to configure SSL based vhost, use Resolution via IP address"), // listen dialog editor help 1/2 "listen" : _("<big>Listen Settings for a Host</big> @@ -182,6 +182,7 @@ from the incoming request, the server looks up the host name specified by the HTTP request headers. The other possibility is to determine the virtual host by the IP address used by the client when connecting to the server. +If you plan to configure SSL based vhost, use Resolution via IP address Consult the Apache2 manual for further details.\n"), // advanced new host dialog 1/5 "set_vhost" : _("<big>Details for New Host</big> @@ -191,7 +192,7 @@ to run CGI scripts in the path in CGI Directory Path using the alias <tt>/cgi-bin/</tt>.") // advanced new host dialog 3/5 +_("For HTTPS access to this virtual host, select Enable SSL Support.\n -Then enter the path for the certificate file in Certificate File Path.") +Then enter the path for the certificate file in Certificate File Path.This option is available only for IP based vhosts.") // advanced new host dialog 4/5 +_("In Directory Index, enter a space-separated list of files that Apache should look for and provide when a URL for a directory (one that ends in <tt>/</tt>) is requested. The first matching file found is provided.") // advanced new host dialog 5/5 -- 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] r48674 - /branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: aschnell Date: Fri Jun 27 21:36:21 2008 New Revision: 48674 URL: http://svn.opensuse.org/viewcvs/yast?rev=48674&view=rev Log: - playing with locales Modified: branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc Modified: branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/li… ============================================================================== --- branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc (original) +++ branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc Fri Jun 27 21:36:21 2008 @@ -6384,7 +6384,7 @@ static int numSuffixes() { - return 5; + return 6; } @@ -6411,6 +6411,10 @@ case 4: /* TeraByte abbreviated */ return classic ? "TB" : _("TB"); + + case 5: + /* PetaByte abbreviated */ + return classic ? "PB" : _("PB"); } return string("error"); @@ -6420,7 +6424,7 @@ string Storage::byteToHumanString(unsigned long long size, bool classic, int precision, bool omit_zeroes) const { - const locale loc = locale::classic(); + const locale loc = classic ? locale::classic() : locale(); double f = (double)(size); int suffix = 0; @@ -6449,7 +6453,7 @@ bool Storage::humanStringToByte(const string& str, bool classic, unsigned long long& size) const { - const locale loc = locale::classic(); + const locale loc = classic ? locale::classic() : locale(); istringstream s(boost::trim_copy(str, loc)); s.imbue(loc); -- 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] r48673 - /trunk/bootloader/src/routines/dialogs.ycp
by juhliarik＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: juhliarik Date: Fri Jun 27 18:57:57 2008 New Revision: 48673 URL: http://svn.opensuse.org/viewcvs/yast?rev=48673&view=rev Log: added fix for correct labels on buttons M bootloader/src/routines/dialogs.ycp * Labels: Abort -> Cancel and Finish -> OK Modified: trunk/bootloader/src/routines/dialogs.ycp Modified: trunk/bootloader/src/routines/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/dialogs.… ============================================================================== --- trunk/bootloader/src/routines/dialogs.ycp (original) +++ trunk/bootloader/src/routines/dialogs.ycp Fri Jun 27 18:57:57 2008 @@ -125,8 +125,8 @@ "contents" : contents, "caption" : caption, "back_button" : Label::BackButton (), - "abort_button" : (!Mode::installation()) ? Label::AbortButton () : Label::CancelButton (), - "next_button" : (!Mode::installation()) ? Label::FinishButton () : Label::OKButton (), + "abort_button" :Label::CancelButton (), + "next_button" : Label::OKButton (), "fallback_functions" : global_handlers, ]); if (ret != `back && ret != `abort && ret != `cancel) -- 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] r48672 - /trunk/add-on/src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: locilka Date: Fri Jun 27 18:50:39 2008 New Revision: 48672 URL: http://svn.opensuse.org/viewcvs/yast?rev=48672&view=rev Log: Added possibility to run package manager from the overview dialog Modified: trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Fri Jun 27 18:50:39 2008 @@ -1050,7 +1050,9 @@ `PushButton (`id (`add), Label::AddButton()), `HSpacing (1), `PushButton (`id (`delete), Label::DeleteButton()), - `HStretch() + `HStretch(), + // TRANSLATORS: push button + `PushButton (`id (`packager), _("Run &Package Manager...")) ) ), // TRANSLATORS: dialog help adp/1 @@ -1144,6 +1146,22 @@ UI::ChangeWidget (`id(`delete), `Enabled, (size (all_products) > 0)); } +boolean RunPackageSelector () { + boolean solve_ret = Pkg::PkgSolve (false); + y2milestone ("Calling Solve() retutned: %1", solve_ret); + + map opts = $[ "dialog_type" : `summaryMode, "repo_mgmt" : true ]; + + y2milestone ("Running inst_packages: Using packager widget options: %1", opts); + symbol result = (symbol) WFM::CallFunction ("inst_packages", [opts]); + y2milestone ("inst_packages returned: %1", result); + + if (result == `accept) { + y2error ("FIXME: ....."); + // set variable to run inst_rpmcopy at the end... + } +} + /** * Removes the currently selected Add-On * @@ -1248,19 +1266,7 @@ }); if (status_changed) { - boolean solve_ret = Pkg::PkgSolve (false); - y2milestone ("Calling Solve() retutned: %1", solve_ret); - - map opts = $[ "dialog_type" : `summaryMode, "repo_mgmt" : true ]; - - y2milestone ("Running inst_packages: Using packager widget options: %1", opts); - symbol result = (symbol) WFM::CallFunction ("inst_packages", [opts]); - y2milestone ("inst_packages returned: %1", result); - - if (result == `accept) { - y2error ("FIXME: ....."); - // set variable to run inst_rpmcopy at the end... - } + RunPackageSelector(); } return true; @@ -1323,6 +1329,8 @@ RedrawAddOnsOverviewTable(); } else if (userret == "list_of_addons") { AdjustInfoWidget(); + } else if (userret == `packager) { + RunPackageSelector(); } else { y2error ("Uknown ret: %1", userret); } -- 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] r48671 - /branches/tmp/aschnell/part-redesign/yast2-storage.spec.in
by aschnell＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: aschnell Date: Fri Jun 27 18:21:09 2008 New Revision: 48671 URL: http://svn.opensuse.org/viewcvs/yast?rev=48671&view=rev Log: - boost is required now Modified: branches/tmp/aschnell/part-redesign/yast2-storage.spec.in Modified: branches/tmp/aschnell/part-redesign/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/ya… ============================================================================== --- branches/tmp/aschnell/part-redesign/yast2-storage.spec.in (original) +++ branches/tmp/aschnell/part-redesign/yast2-storage.spec.in Fri Jun 27 18:21:09 2008 @@ -2,7 +2,7 @@ @HEADER@ -BuildRequires: blocxx-devel evms evms-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite yast2-perl-bindings +BuildRequires: blocxx-devel boost-devel evms evms-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite yast2-perl-bindings Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid kpartx cryptsetup # proc_meminfo.scr moved to yast2-2.15.23 # Installation::installedVersion and Installation::updateVersion -- 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] r48670 - in /trunk/add-on: package/yast2-add-on.changes src/add-on-workflow.ycp src/add-on.ycp yast2-add-on.spec.in
by locilka＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: locilka Date: Fri Jun 27 18:13:26 2008 New Revision: 48670 URL: http://svn.opensuse.org/viewcvs/yast?rev=48670&view=rev Log: - Implemented Add-Ons overview (FATE #303588). - Implemented deinstallation of Add-On (FATE #300654). Modified: trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp trunk/add-on/src/add-on.ycp trunk/add-on/yast2-add-on.spec.in Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Fri Jun 27 18:13:26 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 27 18:11:27 CEST 2008 - locilka(a)suse.cz + +- Implemented Add-Ons overview (FATE #303588). +- Implemented deinstallation of Add-On (FATE #300654). + +------------------------------------------------------------------- Tue Jun 17 14:23:45 CEST 2008 - lslezak(a)suse.cz - use Pkg::SourceSaveAll() instead of Pkg::SourceFinishAll() Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Fri Jun 27 18:13:26 2008 @@ -1021,5 +1021,316 @@ return ret; } +// AddOnsOverviewDialog --> + +void CreateAddOnsOverviewDialog () { + y2milestone ("Creating OverviewDialog"); + + Wizard::SetContents ( + // TRANSLATORS: dialog caption + _("Installed Add-On Products"), + `VBox ( + `Table ( + `id ("list_of_addons"), + `opt (`notify, `immediate), + `header ( + // TRANSLATORS: table header item + _("Add-On Product"), + // TRANSLATORS: table header item + _("URL") + ), + [] + ), + `VSquash( + `MinHeight (3, + `RichText (`id ("product_details"), "") + ) + ), + `HBox ( + `PushButton (`id (`add), Label::AddButton()), + `HSpacing (1), + `PushButton (`id (`delete), Label::DeleteButton()), + `HStretch() + ) + ), + // TRANSLATORS: dialog help adp/1 + _("Here you can see all add-on products installed on your system.") + + // TRANSLATORS: dialog help adp/2 + _("Use Add button to use a new add-on product or Delete to remove an add-on in use."), + false, + true + ); + + Wizard::SetNextButton (`next, Label::FinishButton()); + Wizard::SetAbortButton (`abort, Label::CancelButton()); +} + +map product_infos = $[]; + +map ReturnCurrentlySelectedProductInfo () { + if (! UI::WidgetExists (`id ("list_of_addons"))) { + y2error ("No such widget: %1", "list_of_addons"); + return nil; + } + + string item_id = (string) UI::QueryWidget (`id ("list_of_addons"), `CurrentItem); + + // no items + if (item_id == nil) { + return nil; + } + + if (! regexpmatch (item_id, "product_")) { + y2error ("Wrong product ID '%1'", item_id); + return nil; + } + + item_id = substring (item_id, 8); + + return product_infos[item_id]:$[]; +} + +void AdjustInfoWidget () { + map pi = ReturnCurrentlySelectedProductInfo(); + if (pi == nil || pi == $[]) { + UI::ChangeWidget (`id ("product_details"), `Value, ""); + return; + } + + string rt_description = sformat ( + _("Vendor: %1 Repository URL: %2"), + pi["product","vendor"]:_("Unknown vendor"), + pi["repository","url"]:_("Unknown repository URL") + ); + UI::ChangeWidget (`id ("product_details"), `Value, rt_description); +} + +void RedrawAddOnsOverviewTable () { + list <map <string,any> > all_products = Pkg::ResolvableProperties ("", `product, ""); + + integer medium_nr = nil; + map repository_info = nil; + integer counter = -1; + + list <term> products = []; + product_infos = $[]; + + foreach (map <string,any> one_product, all_products, { + medium_nr = one_product["medium_nr"]:-1; + if (medium_nr != nil && medium_nr != -1) { + counter = counter + 1; + + repository_info = Pkg::SourceGeneralData (one_product["source"]:-1); + + y2milestone ("Product: %1", one_product); + y2milestone ("Info: %1", repository_info); + + product_infos[tostring(counter)] = $[ + "product" : one_product, + "repository" : repository_info, + ]; + + products = add (products, `item ( + `id (sformat ("product_%1", counter)), + one_product["display_name"]:one_product["name"]:_("Unknown product"), + repository_info["url"]:repository_info["base_urls",0]:_("Unknown URL") + )); + } + }); + + UI::ChangeWidget (`id ("list_of_addons"), `Items, products); + AdjustInfoWidget(); + + UI::ChangeWidget (`id(`delete), `Enabled, (size (all_products) > 0)); +} + +/** + * Removes the currently selected Add-On + * + * @return boolean whether something has changed its state + */ +boolean RemoveProductWithDependencies () { + // FIXME: UI feedback is needed + + map pi = ReturnCurrentlySelectedProductInfo(); + if (pi == nil || pi == $[]) { + y2error ("Cannot remove unknown product"); + return false; + } + + string product_name = pi["product","display_name"]:pi["product","name"]:_("Unknown product"); + if (! Confirm::Delete (product_name)) { + y2milestone ("Deleting '%1' canceled", product_name); + return false; + } + + integer src_id = pi["product","source"]:-1; + + // Temporary definitions + boolean pack_ret = false; + string package_string = ""; + + // ["pkg1 version release arch", "pkg2 version release arch", ... ] + list <string> installed_packages = maplist (string inst_package, Pkg::GetPackages (`installed, false), { + // ... but we need ["pkg1 version-release arch", "pkg2 version-release arch", ... ] + return regexpsub (inst_package, "(.*) (.*) (.*) (.*)", "\\1 \\2-\\3 \\4"); + }); + + // y2milestone ("Installed packages: %1", installed_packages); + + // All packages from Add-On / Repository + list <map <string,any> > packages_from_repo = Pkg::ResolvableProperties ("", `package, ""); + + packages_from_repo = filter (map <string, any> one_package, packages_from_repo, { + // Package is not at the repository to be deleted + if (one_package["source"]:-1 != src_id) + return false; + + // Package *is* at the repository to delete + + // "name version-release arch", "version" already contains a release + package_string = sformat ("%1 %2 %3", one_package["name"]:"", one_package["version"]:"", one_package["arch"]:""); + + // The very same package (which is avaliable at the source) is also installed + return contains (installed_packages, package_string); + }); + + y2milestone ("%1 packages installed from repository", size (packages_from_repo)); + + // Removing selected product, whatever it means + if ((pi["product","status"]:`unknown == `installed || pi["product","status"]:`unknown == `selected) && pi["product","name"]:"" != "") { + y2milestone ("Removing product: '%1'", pi["product","name"]:""); + Pkg::ResolvableRemove (pi["product","name"]:"", `product); + } else { + y2milestone ("Product is neither `installed nor `selected"); + } + + // Removing repository of the selected product + if (src_id > -1) { + y2milestone ("Removing repository: %1, url: %2", src_id, pi["repository","url"]:""); + Pkg::SourceDelete (src_id); + } else { + y2milestone ("Product doesn't have any repository in use"); + } + + // The product repository is already removed, checking all installed packages + + // All available packages + list <string> available_packages = maplist (string inst_package, Pkg::GetPackages (`available, false), { + // ... but we need ["pkg1 version-release arch", "pkg2 version-release arch", ... ] + return regexpsub (inst_package, "(.*) (.*) (.*) (.*)", "\\1 \\2-\\3 \\4"); + }); + + list <string> available_package_names = Pkg::GetPackages (`available, true); + y2milestone ("%1 available packages", size (available_package_names)); + + boolean status_changed = false; + + // check all packages installed from the just removed repository + foreach (map <string, any> one_package, packages_from_repo, { + // "name version-release arch", "version" already contains a release + package_string = sformat ("%1 %2 %3", one_package["name"]:"", one_package["version"]:"", one_package["arch"]:""); + + // installed package is not available anymore + if (! contains (available_packages, package_string)) { + status_changed = true; + + // it must be removed + y2milestone ("Removing: %1", package_string); + Pkg::ResolvableRemove (one_package["name"]:"~~~", `package); + + // but if another version is present, select if for installation + if (contains (available_package_names, one_package["name"]:"~~~")) { + y2milestone ("Installing another version of %1", one_package["name"]:""); + Pkg::ResolvableInstall (one_package["name"]:"", `package); + } + } + }); + + if (status_changed) { + boolean solve_ret = Pkg::PkgSolve (false); + y2milestone ("Calling Solve() retutned: %1", solve_ret); + + map opts = $[ "dialog_type" : `summaryMode, "repo_mgmt" : true ]; + + y2milestone ("Running inst_packages: Using packager widget options: %1", opts); + symbol result = (symbol) WFM::CallFunction ("inst_packages", [opts]); + y2milestone ("inst_packages returned: %1", result); + + if (result == `accept) { + y2error ("FIXME: ....."); + // set variable to run inst_rpmcopy at the end... + } + } + + return true; +} + +void RunAddProductWorkflow () { + // feedback heading + string heading = _("Add-On Product Installation"); + // feedback message + string message + = _("Reading packages available at the installation repositories..."); + + Popup::ShowFeedback (heading, message); + + y2milestone ("syncing srcid %1 to zmd", AddOnProduct::src_id); + boolean synced + = SourceManager::SyncAddedAndDeleted ([AddOnProduct::src_id], []); + y2milestone ("sync status: %1", synced); + + Popup::ClearFeedback (); + + WFM::CallFunction ("inst_addon_update_sources", []); + AddOnProduct::DoInstall(); + // Write only when there are some changes + Write(); + + Pkg::SourceReleaseAll(); +} + +symbol RunAddOnsOverviewDialog () { + y2milestone ("Overview Dialog"); + symbol ret = `next; + + // to see which products are installed + Pkg::PkgSolve (true); + + CreateAddOnsOverviewDialog(); + RedrawAddOnsOverviewTable(); + + any userret = nil; + + while (true) { + userret = UI::UserInput(); + + if (userret == `abort) { + ret = `abort; + break; + } else if (userret == `next || userret == `finish) { + ret = `next; + break; + } else if (userret == `add) { + if (RunWizard() == `next) { + RunAddProductWorkflow(); + } + + CreateAddOnsOverviewDialog(); + RedrawAddOnsOverviewTable(); + } else if (userret == `delete) { + if (RemoveProductWithDependencies()) + RedrawAddOnsOverviewTable(); + } else if (userret == "list_of_addons") { + AdjustInfoWidget(); + } else { + y2error ("Uknown ret: %1", userret); + } + } + + return ret; +} + +// <-- AddOnsOverviewDialog } //end of include Modified: trunk/add-on/src/add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on.ycp?rev=48670&… ============================================================================== --- trunk/add-on/src/add-on.ycp (original) +++ trunk/add-on/src/add-on.ycp Fri Jun 27 18:13:26 2008 @@ -53,7 +53,7 @@ Wizard::SetContents ( // dialog caption - _("Add-On Product Media"), + _("Add-On Products"), // busy message (dialog) `VBox(`Label(_("Initializing..."))), // help @@ -79,7 +79,8 @@ } // initialize target to import all trusted keys (#165849) -Pkg::TargetInit( "/", false ); +Pkg::TargetInitialize ("/"); +Pkg::TargetLoad(); PackageCallbacksInit::InitPackageCallbacks (); @@ -94,8 +95,8 @@ if (size (WFM::Args()) == 0) { - y2milestone ("Url not specified in the command line, asking user"); - ret = RunWizard(); + y2milestone ("Url not specified in cmdline, starting full-featured module"); + ret = RunAddOnsOverviewDialog(); } else { @@ -109,33 +110,15 @@ ret = RunAutorunWizard (); } - // bugzilla #293428 - // Release all sources before adding a new one - // because of CD/DVD + url cd:// - Pkg::SourceReleaseAll(); - -if (ret == `next) -{ - // feedback heading - string heading = _("Add-On Product Installation"); - // feedback message - string message - = _("Reading packages available at the installation repositories..."); - - Popup::ShowFeedback (heading, message); - - y2milestone ("syncing srcid %1 to zmd", AddOnProduct::src_id); - boolean synced - = SourceManager::SyncAddedAndDeleted ([AddOnProduct::src_id], []); - y2milestone ("sync status: %1", synced); - - Popup::ClearFeedback (); - - WFM::CallFunction ("inst_addon_update_sources", []); - ret = AddOnProduct::DoInstall (); - // Write only when there are some changes - Write(); +if (ret == `next) { + Pkg::SourceSaveAll(); } + +// bugzilla #293428 +// Release all sources before adding a new one +// because of CD/DVD + url cd:// +Pkg::SourceReleaseAll(); + UI::CloseDialog(); return ret; Modified: trunk/add-on/yast2-add-on.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/yast2-add-on.spec.in?rev=… ============================================================================== --- trunk/add-on/yast2-add-on.spec.in (original) +++ trunk/add-on/yast2-add-on.spec.in Fri Jun 27 18:13:26 2008 @@ -22,6 +22,9 @@ # SCR::RegisterNewAgents, bugzilla #245508 Conflicts: yast2-core < 2.15.4 +# Fixed Pkg::GetPackages(`available) to ignore installed packages +Conflicts: yast2-pkg-bindings < 2.17.2 + BuildArchitectures: noarch Summary: Add-On Configuration -- 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] r48669 - in /branches/tmp/aschnell/part-redesign: libstorage/src/ storage/src/include/ storage/src/modules/
by aschnell＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: aschnell Date: Fri Jun 27 17:58:55 2008 New Revision: 48669 URL: http://svn.opensuse.org/viewcvs/yast?rev=48669&view=rev Log: - backup commit Modified: branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc branches/tmp/aschnell/part-redesign/libstorage/src/Storage.h branches/tmp/aschnell/part-redesign/libstorage/src/StorageInterface.h branches/tmp/aschnell/part-redesign/libstorage/src/Volume.cc branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp Modified: branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/li… ============================================================================== --- branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc (original) +++ branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc Fri Jun 27 17:58:55 2008 @@ -16,6 +16,7 @@ #include <fstream> #include <sstream> #include <iostream> +#include <boost/algorithm/string.hpp> #include <sys/utsname.h> @@ -6381,28 +6382,53 @@ } -string Storage::byteToHumanString(unsigned long long size, int precision, bool omit_zeroes) const +static int numSuffixes() { - const char* prefixes[] = { - /* Byte abbreviated */ - _("B"), - /* KiloByte abbreviated */ - _("kB"), - /* MegaByte abbreviated */ - _("MB"), - /* GigaByte abbreviated */ - _("GB"), - /* TeraByte abbreviated */ - _("TB") - }; + return 5; +} + + +static string suffixes(int i, bool classic) +{ + switch (i) + { + case 0: + /* Byte abbreviated */ + return classic ? "B" : _("B"); + + case 1: + /* KiloByte abbreviated */ + return classic ? "kB" : _("kB"); + + case 2: + /* MegaByte abbreviated */ + return classic ? "MB" : _("MB"); + + case 3: + /* GigaByte abbreviated */ + return classic ? "GB" : _("GB"); + + case 4: + /* TeraByte abbreviated */ + return classic ? "TB" : _("TB"); + } + + return string("error"); +} + + +string Storage::byteToHumanString(unsigned long long size, bool classic, int precision, + bool omit_zeroes) const +{ + const locale loc = locale::classic(); double f = (double)(size); - unsigned int prefix = 0; + int suffix = 0; - while (f >= 1024.0 && prefix + 1 < lengthof(prefixes)) + while (f >= 1024.0 && suffix + 1 < numSuffixes()) { f /= 1024.0; - prefix++; + suffix++; } if (omit_zeroes && (f == (unsigned long long)(f))) @@ -6411,13 +6437,47 @@ } ostringstream s; + s.imbue(loc); s.setf(ios::fixed); s.precision(precision); - s << f << ' ' << prefixes[prefix]; + + s << f << ' ' << suffixes(suffix, classic); + return s.str(); } +bool Storage::humanStringToByte(const string& str, bool classic, unsigned long long& size) const +{ + const locale loc = locale::classic(); + + istringstream s(boost::trim_copy(str, loc)); + s.imbue(loc); + + double f; + string suffix; + s >> f >> suffix; + + if (s.fail() || !s.eof() || f < 0.0) + return false; + + boost::to_lower(suffix, loc); + + for(int i = 0; i < numSuffixes(); i++) + { + if (suffix == boost::to_lower_copy(suffixes(i, classic))) + { + size = f; + return true; + } + + f *= 1024.0; + } + + return false; +} + + namespace storage { std::ostream& operator<< (std::ostream& s, Storage &v ) Modified: branches/tmp/aschnell/part-redesign/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/li… ============================================================================== --- branches/tmp/aschnell/part-redesign/libstorage/src/Storage.h (original) +++ branches/tmp/aschnell/part-redesign/libstorage/src/Storage.h Fri Jun 27 17:58:55 2008 @@ -470,8 +470,9 @@ void updateDmEmptyPeMap(); void dumpObjectList(); - string byteToHumanString(unsigned long long size, int precision, bool omit_zeroes) const; - + string byteToHumanString(unsigned long long size, bool classic, int precision, bool omit_zeroes) const; + bool humanStringToByte(const string& str, bool classic, unsigned long long& size) const; + void setCallbackProgressBar( storage::CallbackProgressBar pfnc ) { progress_bar_cb=pfnc; } storage::CallbackProgressBar getCallbackProgressBar() const Modified: branches/tmp/aschnell/part-redesign/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/li… ============================================================================== --- branches/tmp/aschnell/part-redesign/libstorage/src/StorageInterface.h (original) +++ branches/tmp/aschnell/part-redesign/libstorage/src/StorageInterface.h Fri Jun 27 17:58:55 2008 @@ -2170,17 +2170,33 @@ * and using B, kB, MB, GB or TB as unit as appropriate. * * @param size size in bytes + * @param classic use classic locale * @param precision number of fraction digits in output * @param omit_zeroes if true omit trailing zeroes for exact values * @return formatted string * - * @example byteToHumanString(128, 2, true) -> "128 B" - * @example byteToHumanString(4096, 2, true) -> "4 kB" - * @example byteToHumanString(4096, 2, false) -> "4.00 kB" - * @example byteToHumanString(1024*1024, 2, true) -> "1 MB" + * @example byteToHumanString(128, true, 2, true) -> "128 B" + * @example byteToHumanString(4096, true, 2, true) -> "4 kB" + * @example byteToHumanString(4096, true, 2, false) -> "4.00 kB" + * @example byteToHumanString(1024*1024, true, 2, true) -> "1 MB" */ - virtual string byteToHumanString(unsigned long long size, int precision, + virtual string byteToHumanString(unsigned long long size, bool classic, int precision, bool omit_zeroes) const = 0; + + /** + * Converts a size description using B, kB, MB, GB or TB into an integer. + * + * @param str size string + * @param classic use classic locale + * @param size size in bytes + * @return true on successful conversion + * + * @example humanStringToByte("4kB", true, size) -> true and size = 4*1024 + * @example humanStringToByte("4 MB", true, size) -> true and size = 4*1024*1024 + * @example humanStringToByte("0.5 GB", true, size) -> true and size = 512*1024*1024 + */ + virtual bool humanStringToByte(const string& str, bool classic, unsigned long long& + size) const = 0; }; Modified: branches/tmp/aschnell/part-redesign/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/li… ============================================================================== --- branches/tmp/aschnell/part-redesign/libstorage/src/Volume.cc (original) +++ branches/tmp/aschnell/part-redesign/libstorage/src/Volume.cc Fri Jun 27 17:58:55 2008 @@ -2558,7 +2558,7 @@ string Volume::sizeString() const { - return cont->getStorage()->byteToHumanString(1024 * size_k, 2, false); + return cont->getStorage()->byteToHumanString(1024 * size_k, false, 2, false); } bool Volume::canUseDevice() const Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Fri Jun 27 17:58:55 2008 @@ -80,7 +80,11 @@ { // TODO string s = (string) UI::QueryWidget(`id(`size_input), `Value); - integer i = Storage::KmgtStrToByte(s); + + integer i = 0; + Storage::HumanStringToByte(s, i); + // integer i = Storage::KmgtStrToByte(s); + integer num_cyl = tointeger(float::ceil(tofloat(i) / tofloat(data["cyl_size"]:42))); data["region"] = [ slot[0]:0, num_cyl ]; break; @@ -113,6 +117,9 @@ string tmp = Storage::ByteToHumanString(max_size); + symbol what = `max_size; + integer manual_size = 0; + frames = add(frames, `Frame(_("Size"), `RadioButtonGroup(`id(`size), @@ -172,7 +179,19 @@ break; case `next: - // TODO: checks + what = (symbol) UI::QueryWidget(`id(`size), `Value); + if (what == `manual_size) + { + string s = (string) UI::QueryWidget(`id(`size_input), `Value); + if (!Storage::HumanStringToByte(s, manual_size)) + { + Error(_("The size in invalid. TODO")); + widget = `again; + } + } + + // TODO min-size check + stripes = (integer) UI::QueryWidget(`id(`stripes), `Value); stripe_size = (integer) UI::QueryWidget(`id(`stripe_size), `Value); break; @@ -182,16 +201,14 @@ if (widget == `next) { - switch ((symbol) UI::QueryWidget(`id(`size), `Value)) + switch (what) { case `max_size: data["size_k"] = max_size / 1024; break; case `manual_size: - string s = (string) UI::QueryWidget(`id(`size_input), `Value); - integer i = Storage::KmgtStrToByte(s); - data["size_k"] = i / 1024; + data["size_k"] = manual_size / 1024; break; } Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp Fri Jun 27 17:58:55 2008 @@ -322,13 +322,21 @@ global string ByteToHumanString(integer bytes) { - return LibStorage::StorageInterface::byteToHumanString(sint, bytes, 2, false); + return LibStorage::StorageInterface::byteToHumanString(sint, bytes, false, 2, false); } global string ByteToHumanStringWithPrecision(integer bytes, integer precision, boolean omit_zeroes) { - return LibStorage::StorageInterface::byteToHumanString(sint, bytes, precision, omit_zeroes); + return LibStorage::StorageInterface::byteToHumanString(sint, bytes, false, precision, omit_zeroes); +} + + +global boolean HumanStringToByte(string str, integer& bytes) +{ + boolean ret = LibStorage::StorageInterface::humanStringToByte(sint, str, false, bytes); + y2milestone("HumanStringToByte ret:%1 str:%2 bytes:%3", ret, str, bytes); + return ret; } -- 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] r48668 - /trunk/python-bindings/src/YCP.cc
by juhliarik＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: juhliarik Date: Fri Jun 27 17:31:56 2008 New Revision: 48668 URL: http://svn.opensuse.org/viewcvs/yast?rev=48668&view=rev Log: added description of functions M python-bindings/src/YCP.cc * added description Modified: trunk/python-bindings/src/YCP.cc Modified: trunk/python-bindings/src/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCP.cc?rev=4… ============================================================================== --- trunk/python-bindings/src/YCP.cc (original) +++ trunk/python-bindings/src/YCP.cc Fri Jun 27 17:31:56 2008 @@ -69,6 +69,13 @@ void InitYCPTermList(); +/** + * Function check SymbolEntry and add name + * to ycpListFunctions if it is function or + * add it to ycpListVariables if it is variable + * @param const SymbolEntry for analyse + * @return bool always return true + */ static bool HandleSymbolTable (const SymbolEntry & se) { if (se.isFunction ()) { @@ -108,42 +115,76 @@ return ns; } - +/** + * defined function for "run" from static python module ycp + * it is in static PyMethodDef YCPMethods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * return value from CallYCPFunction() + */ static PyObject * ycp_handle_function(PyObject *self, PyObject *args) { return CallYCPFunction (args); } - +/** + * defined function for "import_module" from static python module ycp + * it is in static PyMethodDef YCPMethods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * return value from ImportYCPNameSpace() + */ static PyObject * ycp_import_namespace(PyObject *self, PyObject *args) { return ImportYCPNameSpace (args); } +/** + * defined function for "init_ui" from static python module ycp + * it is in static PyMethodDef YCPMethods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * return value from InitUI() + */ static PyObject * ycp_init_ui(PyObject *self, PyObject *args) { return InitUI (args); } -static PyObject * ycp_scr_handle(PyObject *self, PyObject *args) -{ - return _SCR_Run(args); -} - - +/** + * defined function for "y2logger" from static python module ycp + * it is in static PyMethodDef YCPMethods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * always Py_None + */ static PyObject * ycp_y2logger (PyObject *self, PyObject *args) { PyY2logger(args); return Py_None; } - +/** + * defined function for "widget_names" from static python module ycp + * it is in static PyMethodDef YCPMethods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * return value from InitTerm() + */ static PyObject * ycp_init_term(PyObject *self, PyObject *args) { return InitTerm(args); } + +/** + * defined function for "__change_widget_name" from static python module ycp + * it is in static PyMethodDef YCPMethods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * return value from ChangeWidgetName() + */ static PyObject * ycp_change_widget_name(PyObject *self, PyObject *args) { return ChangeWidgetName(args); @@ -159,9 +200,21 @@ {NULL, NULL, 0, NULL} }; +/** + * defined function for "__scr_run" from python module for SCR + * it is in static PyMethodDef scr_methods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * return value from _SCR_Run() + */ +static PyObject * ycp_scr_handle(PyObject *self, PyObject *args) +{ + return _SCR_Run(args); +} + /** - * This is necessary for regulat (python style) calling SCR from python + * This is necessary for regular (python style) calling SCR from python */ static PyMethodDef scr_methods[] = { @@ -178,6 +231,9 @@ {NULL, NULL, 0, NULL} }; +/** + * Basic definition of methods python module ycp + */ static PyMethodDef YCPMethods[] = { {"run", ycp_handle_function, METH_VARARGS, "Calling YCP from Python"}, @@ -189,6 +245,12 @@ {NULL, NULL, 0, NULL} /* Sentinel */ }; + +/** + * Init function for python module ycp + * it includes definition of debug function and support for localization + */ + PyMODINIT_FUNC initycp(void) { @@ -287,7 +349,9 @@ //InitTerm(NULL); } - +/** + * All names of known widget from YCP are added to ycpTermList + */ void InitYCPTermList() { // adding terms @@ -360,12 +424,15 @@ } - +/** + * Function handle adding all known widgets to python namespace (module ycp) + * it is usefull for writting UI in python. + */ PyObject * InitTerm(PyObject *args) { int number_args = PyTuple_Size(args); - // adding false into pResult + // adding false into pResult PyObject *pResult = PyBool_FromLong(0); PyObject *dict = PyModule_GetDict(Self); @@ -380,7 +447,7 @@ { PyObject *pPythonValue = PyTuple_GetItem(args, 0); - string widget_ns = "term"; + string widget_ns = "term"; if (pPythonValue) { @@ -401,7 +468,7 @@ PyObject *new_module = Py_InitModule(widget_ns.c_str(), term_methods); if (new_module == NULL) return pResult; - initYCPTermType(new_module); + initYCPTermType(new_module); // Add new initialized module into ycp dictionary @@ -670,6 +737,9 @@ /** * Returns true if NameSpace is registered (is key) in dictionary dict. * Otherwise returns false; + * @param PyObject *dict - main dictionary of module ycp(python) + * @param char *NameSpace - name of namespace + * @return true on success */ bool isRegistered(PyObject *dict, const char *NameSpace) { @@ -684,6 +754,13 @@ return ret; } +/** + * Register functions and variables from namespace to python module + * @param char *NameSpace - name of namespace + * @param YCPList list_functions - names of functions + * @param YCPList list_variables - names of variables + * @return true on success + */ bool RegFunctions(char *NameSpace, YCPList list_functions, YCPList list_variables) { @@ -736,7 +813,10 @@ } - +/** + * Register SCR namespace with 4 functions: Read, Write, Dir and Execute + * @return true on success + */ bool RegSCR() { string func_read = @@ -792,6 +872,9 @@ Y2Component *owned_wfmc = 0; +/** + * Init WFM + */ void init_wfm () { @@ -806,6 +889,12 @@ Y2Component *owned_uic = 0; + +/** + * Init UI - select: ncurses, qt or gtk + * @param PyObject *args - string - type of UI + * @return PyObject * true on success + */ PyObject * InitUI (PyObject *args) { @@ -862,7 +951,12 @@ return PyBool_FromLong(1); } - +/** + * Function import module written in YCP. + * It means that create module into namespace of python module ycp + * @param PyObject *args - string - include name of module written in YCP + * @return PyObject * true on success + */ PyObject * ImportYCPNameSpace (PyObject *args) { PyObject* pResult = PyBool_FromLong(0); @@ -908,7 +1002,11 @@ return pResult; } - +/** + * General function handles running SCR command + * @param PyObject *args - tuple of arguments for running SCR + * @return PyObject * result of running SCR + */ PyObject * _SCR_Run (PyObject *args) { // access directly the statically declared builtins @@ -1096,7 +1194,11 @@ } - +/** + * Function handles calling ycp function from python + * @param PyObject *args - tuple with namespace name of function and args for function + * @return PyObject return result of running function + */ PyObject * CallYCPFunction (PyObject *args) { int number_args = PyTuple_Size(args); @@ -1258,6 +1360,12 @@ } } +/** + * General function handles calling debug function in python like: + * y2mileston(), y2error() etc. + * @param PyObject *args - tuple of args for debug function + */ + void PyY2logger(PyObject *args) { int number_args = PyTuple_Size(args); -- 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] r48667 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Package.cc
by lslezak＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: lslezak Date: Fri Jun 27 16:57:32 2008 New Revision: 48667 URL: http://svn.opensuse.org/viewcvs/yast?rev=48667&view=rev Log: - Fixed Pkg::GetPackages(`available) to ignore installed packages Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Jun 27 16:57:32 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jun 27 16:54:00 CEST 2008 - lslezak(a)suse.cz + +- Fixed Pkg::GetPackages(`available) to ignore installed packages + +------------------------------------------------------------------- Fri Jun 27 10:46:36 CEST 2008 - lslezak(a)suse.cz - support for patch messages and patch scripts (bnc#401220) Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Fri Jun 27 16:57:32 2008 @@ -1544,7 +1544,10 @@ } else if (which == "available") { - pkg2list(packages, it, names_only); + if (!it->status().isInstalled()) + { + pkg2list(packages, it, names_only); + } } else if (which == "locked") { -- 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] r48666 - /trunk/python-bindings/src/YCP.cc
by juhliarik＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: juhliarik Date: Fri Jun 27 16:49:13 2008 New Revision: 48666 URL: http://svn.opensuse.org/viewcvs/yast?rev=48666&view=rev Log: added comment for function M python-bindings/src/YCP.cc * added comment for function get_setVariable() Modified: trunk/python-bindings/src/YCP.cc Modified: trunk/python-bindings/src/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCP.cc?rev=4… ============================================================================== --- trunk/python-bindings/src/YCP.cc (original) +++ trunk/python-bindings/src/YCP.cc Fri Jun 27 16:49:13 2008 @@ -1065,7 +1065,13 @@ else return Py_None; } - +/** + * function handle GET/SET value for YCP variable in python + * @param char * name of module + * @param SymbolEntryPtr pointer to symbol entry + * @param PyObject * value or NULL if GET value is called + * @return PyObject return value of variable or None if SET is called + */ PyObject * get_setYCPVariable (const char * ns_name, SymbolEntryPtr var_se, PyObject * pPythonValue) { -- 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] r48665 - in /trunk/ldap-server: src/agent/Makefile.am src/lib/Makefile.am yast2-ldap-server.spec.in
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:34 2008 New Revision: 48665 URL: http://svn.opensuse.org/viewcvs/yast?rev=48665&view=rev Log: - call ldconfig in %post - lookup include files in builddir before /usr/include/YaST - don't package .so and .la files Modified: trunk/ldap-server/src/agent/Makefile.am trunk/ldap-server/src/lib/Makefile.am trunk/ldap-server/yast2-ldap-server.spec.in Modified: trunk/ldap-server/src/agent/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/Makefile.a… ============================================================================== --- trunk/ldap-server/src/agent/Makefile.am (original) +++ trunk/ldap-server/src/agent/Makefile.am Fri Jun 27 16:01:34 2008 @@ -1,8 +1,8 @@ # # Makefile.am for SlapdConfig agent # -AM_CPPFLAGS= -I$(top_srcdir)/src/lib -AM_CXXFLAGS = -DY2LOG=\"agent-slapdconfig\" -Wall -I/usr/include/YaST2 +AM_CPPFLAGS= -I$(top_srcdir)/src/lib -I/usr/include/YaST2 +AM_CXXFLAGS = -DY2LOG=\"agent-slapdconfig\" -Wall plugin_LTLIBRARIES = libpy2ag_slapdconfig.la noinst_LTLIBRARIES = liby2ag_slapdconfig.la Modified: trunk/ldap-server/src/lib/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/Makefile.am?… ============================================================================== --- trunk/ldap-server/src/lib/Makefile.am (original) +++ trunk/ldap-server/src/lib/Makefile.am Fri Jun 27 16:01:34 2008 @@ -1,3 +1,6 @@ +# +# Makefile.am for slapdconfig library +# lib_LTLIBRARIES = libslapdconfig.la libslapdconfig_la_SOURCES = slapd-config.cpp Modified: trunk/ldap-server/yast2-ldap-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/yast2-ldap-server.sp… ============================================================================== --- trunk/ldap-server/yast2-ldap-server.spec.in (original) +++ trunk/ldap-server/yast2-ldap-server.spec.in Fri Jun 27 16:01:34 2008 @@ -16,9 +16,15 @@ @INSTALL@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libslapdconfig.la rm -f $RPM_BUILD_ROOT/%{_libdir}/libslapdconfig.so +rm -f $RPM_BUILD_ROOT/@plugindir@/libpy2ag_slapdconfig.la +rm -f $RPM_BUILD_ROOT/@plugindir@/libpy2ag_slapdconfig.so @CLEAN@ +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root) %dir @yncludedir@/ldap-server -- 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] r48664 - /trunk/ldap-server/src/lib/slapd-config.cpp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:31 2008 New Revision: 48664 URL: http://svn.opensuse.org/viewcvs/yast?rev=48664&view=rev Log: Silence gcc warnings Modified: trunk/ldap-server/src/lib/slapd-config.cpp Modified: trunk/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Fri Jun 27 16:01:31 2008 @@ -1001,7 +1001,7 @@ LDAPSearchResults *sr = m_lc->search( "cn=config", LDAPConnection::SEARCH_ONE, "objectclass=olcDatabaseConfig" ); LDAPEntry *dbEntry; - while ( (dbEntry = sr->getNext()) != 0 ) + while ( (dbEntry = sr->getNext()) ) { std::string dbDn(dbEntry->getDN()); log_it(0,"Got Database Entry: " + dbDn); @@ -1009,7 +1009,7 @@ LDAPSearchResults *overlaySearchRes = m_lc->search( dbDn, LDAPConnection::SEARCH_ONE, "objectclass=olcOverlayConfig" ); LDAPEntry *overlayEntry; - while ( (overlayEntry = overlaySearchRes->getNext()) != 0 ) + while ( (overlayEntry = overlaySearchRes->getNext()) ) { log_it(0,"Got Overlay: " + overlayEntry->getDN() ); boost::shared_ptr<OlcOverlay> overlay(OlcOverlay::createFromLdapEntry(*overlayEntry) ); @@ -1032,7 +1032,7 @@ LDAPSearchResults *sr = m_lc->search( "cn=schema,cn=config", LDAPConnection::SEARCH_SUB, "objectclass=olcSchemaConfig" ); LDAPEntry *entry; - while ( entry = sr->getNext() ) + while ( (entry = sr->getNext()) ) { log_it(0,"Got Schema Entry: " + entry->getDN() ); boost::shared_ptr<OlcSchemaConfig> olce(new OlcSchemaConfig(*entry)); -- 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] r48663 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.cc tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:27 2008 New Revision: 48663 URL: http://svn.opensuse.org/viewcvs/yast?rev=48663&view=rev Log: Don't add/delete ppolicy when nothing was changed Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 16:01:27 2008 @@ -844,42 +844,48 @@ break; } } - boost::shared_ptr<OlcOverlay> ppolicyOlc; - if ( j == overlays.end() ) + YCPMap argMap = arg->asMap(); + if ( j == overlays.end() && argMap.size() == 0 ) { - y2milestone("New Overlay added"); - boost::shared_ptr<OlcOverlay> tmp(new OlcOverlay("ppolicy", (*i)->getDn())); - ppolicyOlc = tmp; - (*i)->addOverlay(ppolicyOlc); + y2milestone("Empty overlay nothing to do"); } - else + else { - y2milestone("Update existing Overlay"); - ppolicyOlc = *j; - } - YCPMap argMap = arg->asMap(); - y2milestone("Mapsize: %ld", argMap.size()); - if ( argMap.size() == 0 ){ - y2milestone("Delete ppolicy overlay"); - ppolicyOlc->clearChangedEntry(); - } else { - ppolicyOlc->setStringValue("olcPpolicyDefault", - argMap->value(YCPString("defaultPolicy"))->asString()->value_cstr() ); - if ( argMap->value(YCPString("useLockout"))->asBoolean()->value() == true ) + boost::shared_ptr<OlcOverlay> ppolicyOlc; + if ( j == overlays.end() ) { - ppolicyOlc->setStringValue("olcPpolicyUseLockout", "TRUE"); + y2milestone("New Overlay added"); + boost::shared_ptr<OlcOverlay> tmp(new OlcOverlay("ppolicy", (*i)->getDn())); + ppolicyOlc = tmp; + (*i)->addOverlay(ppolicyOlc); } else { - ppolicyOlc->setStringValue("olcPpolicyUseLockout", "FALSE"); + y2milestone("Update existing Overlay"); + ppolicyOlc = *j; } - if ( argMap->value(YCPString("hashClearText"))->asBoolean()->value() == true ) - { - ppolicyOlc->setStringValue("olcPpolicyHashCleartext", "TRUE"); - } - else - { - ppolicyOlc->setStringValue("olcPpolicyHashCleartext", "FALSE"); + if ( argMap.size() == 0 ){ + y2milestone("Delete ppolicy overlay"); + ppolicyOlc->clearChangedEntry(); + } else { + ppolicyOlc->setStringValue("olcPpolicyDefault", + argMap->value(YCPString("defaultPolicy"))->asString()->value_cstr() ); + if ( argMap->value(YCPString("useLockout"))->asBoolean()->value() == true ) + { + ppolicyOlc->setStringValue("olcPpolicyUseLockout", "TRUE"); + } + else + { + ppolicyOlc->setStringValue("olcPpolicyUseLockout", "FALSE"); + } + if ( argMap->value(YCPString("hashClearText"))->asBoolean()->value() == true ) + { + ppolicyOlc->setStringValue("olcPpolicyHashCleartext", "TRUE"); + } + else + { + ppolicyOlc->setStringValue("olcPpolicyHashCleartext", "FALSE"); + } } } ret = true; Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 16:01:27 2008 @@ -1096,12 +1096,19 @@ // LdapServer::WriteSchemaIncludeList(inclist); // } } else { - // delete ppolicy - result = LdapServer::AddPasswordPolicy( index, $[] ); - if ( ! result ) { - map<string, string> err = LdapServer::GetError(); - callback_error = err["msg"]:"" + "\n" + err["details"]:""; + map<string,any> ppolicy_map = LdapServer::GetPpolicyOverlay(index); + if ( size(ppolicy_map) == 0 ) + { + result = true; } + else + { + // delete ppolicy + result = LdapServer::AddPasswordPolicy( index, $[] ); + if ( ! result ) { + map<string, string> err = LdapServer::GetError(); + callback_error = err["msg"]:"" + "\n" + err["details"]:""; + } // map<string,string> ppolicy_map = LdapServer::GetPasswordPolicyOverlay(suffix); // if ( ppolicy_map != nil ){ @@ -1117,6 +1124,7 @@ // }); // db["overlay"] = newoverlay; // } + } } return result; } -- 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] r48662 - /trunk/ldap-server/src/lib/slapd-config.cpp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:24 2008 New Revision: 48662 URL: http://svn.opensuse.org/viewcvs/yast?rev=48662&view=rev Log: Fixed logging output Modified: trunk/ldap-server/src/lib/slapd-config.cpp Modified: trunk/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Fri Jun 27 16:01:24 2008 @@ -949,7 +949,7 @@ sr = m_lc->search( "cn=config", LDAPConnection::SEARCH_BASE); dbEntry = sr->getNext(); } catch (LDAPException e) { - log_it(0, e.getResultMsg() + ": " + e.getServerMsg() ); + log_it(0, e.getResultMsg() + " " + e.getServerMsg() ); throw; } if ( dbEntry ) { @@ -967,7 +967,7 @@ LDAPModList ml = olcg.entryDifftoMod(); m_lc->modify( olcg.getDn(), &ml ); } catch (LDAPException e) { - log_it(0, e.getResultMsg() + ": " + e.getServerMsg() ); + log_it(0, e.getResultMsg() + " " + e.getServerMsg() ); throw; } } @@ -989,7 +989,7 @@ } } } catch (LDAPException e) { - log_it(0, e.getResultMsg() + e.getServerMsg() ); + log_it(0, e.getResultMsg() + " " + e.getServerMsg() ); throw; } } @@ -1018,7 +1018,7 @@ res.push_back(olce); } } catch (LDAPException e ) { - log_it(0, e.getResultMsg() + e.getServerMsg() ); + log_it(0, e.getResultMsg() + " " + e.getServerMsg() ); throw; } return res; @@ -1039,7 +1039,7 @@ res.push_back(olce); } } catch (LDAPException e ) { - log_it(0, e.getResultMsg() + e.getServerMsg() ); + log_it(0, e.getResultMsg() + " " + e.getServerMsg() ); throw; } return res; -- 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] r48661 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.cc lib/slapd-config.h
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:21 2008 New Revision: 48661 URL: http://svn.opensuse.org/viewcvs/yast?rev=48661&view=rev Log: Fixed compiler warnings Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/slapd-config.h Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 16:01:21 2008 @@ -476,24 +476,33 @@ y2milestone("Component %s ", dbComponent.c_str()); if ( dbComponent == "indexes" ) { - IndexMap idx = (*i)->getDatabaseIndexes(); - IndexMap::const_iterator j = idx.begin(); - for ( ; j != idx.end(); j++ ) - { - YCPMap ycpIdx; - y2milestone("indexed Attribute: \"%s\"", j->first.c_str() ); - std::vector<IndexType>::const_iterator k = j->second.begin(); - for ( ; k != j->second.end(); k++ ) + boost::shared_ptr<OlcBdbDatabase> bdb = + boost::dynamic_pointer_cast<OlcBdbDatabase>(*i); + if ( bdb == 0 ) + { + y2milestone("Database doesn't provide indexing\n"); + } + else + { + IndexMap idx = bdb->getDatabaseIndexes(); + IndexMap::const_iterator j = idx.begin(); + for ( ; j != idx.end(); j++ ) { - if ( *k == Eq ){ - ycpIdx.add(YCPString("eq"), YCPBoolean(true) ); - } else if ( *k == Present ){ - ycpIdx.add(YCPString("pres"), YCPBoolean(true) ); - } else if ( *k == Sub ){ - ycpIdx.add(YCPString("sub"), YCPBoolean(true) ); + YCPMap ycpIdx; + y2milestone("indexed Attribute: \"%s\"", j->first.c_str() ); + std::vector<IndexType>::const_iterator k = j->second.begin(); + for ( ; k != j->second.end(); k++ ) + { + if ( *k == Eq ){ + ycpIdx.add(YCPString("eq"), YCPBoolean(true) ); + } else if ( *k == Present ){ + ycpIdx.add(YCPString("pres"), YCPBoolean(true) ); + } else if ( *k == Sub ){ + ycpIdx.add(YCPString("sub"), YCPBoolean(true) ); + } } + resMap.add( YCPString(j->first), ycpIdx ); } - resMap.add( YCPString(j->first), ycpIdx ); } return resMap; } @@ -791,28 +800,38 @@ y2milestone("Component '%s'", dbComponent.c_str()); if ( dbComponent == "index" ) { - std::vector<IndexType> idx; - std::string attr( arg->asMap()->value(YCPString("name"))->asString()->value_cstr() ); - y2milestone("Edit Index for Attribute: '%s'", attr.c_str() ); - if ( arg->asMap()->value(YCPString("pres"))->asBoolean()->value() == true ) + boost::shared_ptr<OlcBdbDatabase> bdb = + boost::dynamic_pointer_cast<OlcBdbDatabase>(*i); + if ( bdb == 0 ) { - idx.push_back(Present); + y2milestone("Database doesn't provide indexing\n"); + ret = false; } - if ( arg->asMap()->value(YCPString("eq"))->asBoolean()->value() == true ) - { - idx.push_back(Eq); - } - if ( arg->asMap()->value(YCPString("sub"))->asBoolean()->value() == true ) + else { - idx.push_back(Sub); - } - if ( ( idx.empty()) || ( ! (*i)->getDatabaseIndex(attr).empty() ) ) { - (*i)->deleteIndex( attr ); - } - if ( ! idx.empty() ) { - (*i)->addIndex(attr, idx); + std::vector<IndexType> idx; + std::string attr( arg->asMap()->value(YCPString("name"))->asString()->value_cstr() ); + y2milestone("Edit Index for Attribute: '%s'", attr.c_str() ); + if ( arg->asMap()->value(YCPString("pres"))->asBoolean()->value() == true ) + { + idx.push_back(Present); + } + if ( arg->asMap()->value(YCPString("eq"))->asBoolean()->value() == true ) + { + idx.push_back(Eq); + } + if ( arg->asMap()->value(YCPString("sub"))->asBoolean()->value() == true ) + { + idx.push_back(Sub); + } + if ( ( idx.empty()) || ( ! bdb->getDatabaseIndex(attr).empty() ) ) { + bdb->deleteIndex( attr ); + } + if ( ! idx.empty() ) { + bdb->addIndex(attr, idx); + } + ret = true; } - ret = true; } else if (dbComponent == "ppolicy" ) { Modified: trunk/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.h (original) +++ trunk/ldap-server/src/lib/slapd-config.h Fri Jun 27 16:01:21 2008 @@ -127,10 +127,6 @@ const std::string getType() const; //virtual std::map<std::string, std::list<std::string> > toMap() const; - virtual IndexMap getDatabaseIndexes() const {}; - virtual std::vector<IndexType> getDatabaseIndex( const std::string &attr ) const {}; - virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx) {}; - virtual void deleteIndex(const std::string& attr) {}; void addOverlay(boost::shared_ptr<OlcOverlay> overlay); OlcOverlayList& getOverlays() ; -- 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] r48660 - in /trunk/ldap-server/src: tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:17 2008 New Revision: 48660 URL: http://svn.opensuse.org/viewcvs/yast?rev=48660&view=rev Log: Provide differnt views for differnt types of databases 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.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 16:01:17 2008 @@ -1214,7 +1214,7 @@ map<string,any> item_map = $[ "name" : label, "index" : index, - "widget" : editBdbDatabase, + "widget" : editGenericDatabase, "new_db" : new_db, "dynamic" : true, "help_page" : "database_detail", 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 Fri Jun 27 16:01:17 2008 @@ -322,6 +322,14 @@ generalDbWidget ) ); + term editGenericDatabase = + `Top( + `VBox( + `Heading( _("Edit Database") ), + `VSpacing( 1 ), + `Label( _("Databasetype not supported currently") ) + ) + ); term editBdbIndexes = `VBox( -- 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] r48659 - /trunk/ldap-server/src/ldap-server_auto.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:14 2008 New Revision: 48659 URL: http://svn.opensuse.org/viewcvs/yast?rev=48659&view=rev Log: AutoYaST support doesn't work currently Modified: trunk/ldap-server/src/ldap-server_auto.ycp Modified: trunk/ldap-server/src/ldap-server_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server_auto… ============================================================================== --- trunk/ldap-server/src/ldap-server_auto.ycp (original) +++ trunk/ldap-server/src/ldap-server_auto.ycp Fri Jun 27 16:01:14 2008 @@ -44,7 +44,7 @@ /* Create a summary*/ if(func == "Summary") { - ret = (LdapServer::Summary())[0]:""; + ret = LdapServer::Summary(); } /* Reset configuration */ else if (func == "Reset") { @@ -95,7 +95,7 @@ * return boolean */ else if (func == "SetModified") { - LdapServer::SetModified (true); + //LdapServer::SetModified (true); ret = true; } -- 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] r48658 - in /trunk/ldap-server: configure.in.in src/agent/Makefile.am src/lib/Makefile.am yast2-ldap-server.spec.in
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:10 2008 New Revision: 48658 URL: http://svn.opensuse.org/viewcvs/yast?rev=48658&view=rev Log: fixed RPM building Modified: trunk/ldap-server/configure.in.in trunk/ldap-server/src/agent/Makefile.am trunk/ldap-server/src/lib/Makefile.am trunk/ldap-server/yast2-ldap-server.spec.in Modified: trunk/ldap-server/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/configure.in.in?rev=… ============================================================================== --- trunk/ldap-server/configure.in.in (original) +++ trunk/ldap-server/configure.in.in Fri Jun 27 16:01:10 2008 @@ -16,6 +16,11 @@ if [[ "$yast_found_ldapcpplib" = "no" ]]; then AC_MSG_ERROR(Headers for ldapcpplib are missing. Please install the package ldapcpplib-devel.) fi +yast_found_boost=no +AC_CHECK_HEADER(boost/shared_ptr.hpp,[yast_found_boost=yes]) +if [[ "$yast_found_boost" = "no" ]]; then + AC_MSG_ERROR(Boost Headers are missing. Please install the package boost-devel.) +fi AC_LANG_POP(C++) ## and generate the output... Modified: trunk/ldap-server/src/agent/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/Makefile.a… ============================================================================== --- trunk/ldap-server/src/agent/Makefile.am (original) +++ trunk/ldap-server/src/agent/Makefile.am Fri Jun 27 16:01:10 2008 @@ -14,7 +14,8 @@ libpy2ag_slapdconfig_la_SOURCES = \ $(liby2ag_slapdconfig_la_SOURCES) \ - Y2CCSlapdConfigAgent.cc #Y2CCLdapAgent.h + Y2CCSlapdConfigAgent.cc + libpy2ag_slapdconfig_la_LDFLAGS = -version-info 2:0 libpy2ag_slapdconfig_la_LIBADD = ../lib/libslapdconfig.la @AGENT_LIBADD@ -L$(libdir) Modified: trunk/ldap-server/src/lib/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/Makefile.am?… ============================================================================== --- trunk/ldap-server/src/lib/Makefile.am (original) +++ trunk/ldap-server/src/lib/Makefile.am Fri Jun 27 16:01:10 2008 @@ -2,7 +2,7 @@ libslapdconfig_la_SOURCES = slapd-config.cpp -include_HEADERS = slapd-config.h +noinst_HEADERS = slapd-config.h libslapdconfig_la_LIBADD = -lldapcpp libslapdconfig_la_LDFLAGS = -version-info 0:1:0 Modified: trunk/ldap-server/yast2-ldap-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/yast2-ldap-server.sp… ============================================================================== --- trunk/ldap-server/yast2-ldap-server.spec.in (original) +++ trunk/ldap-server/yast2-ldap-server.spec.in Fri Jun 27 16:01:10 2008 @@ -1,11 +1,9 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools +BuildRequires: pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools libldapcpp-devel boost-devel gcc-c++ Requires: acl yast2 yast2-users yast2-ldap-client yast2-network perl perl-gettext yast2-perl-bindings yast2-ca-management perl-X500-DN perl-Digest-SHA1 net-tools -BuildArchitectures: noarch - Summary: Configuration of the OpenLDAP server %description @@ -16,6 +14,8 @@ @BUILD@ @INSTALL@ +rm -f $RPM_BUILD_ROOT/%{_libdir}/libslapdconfig.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/libslapdconfig.so @CLEAN@ @@ -23,13 +23,14 @@ %defattr(-,root,root) %dir @yncludedir@/ldap-server %dir @moduledir@/YaPI +%{_libdir}/libslapdconfig.so.* @yncludedir@/ldap-server/* @clientdir@/ldap-server.ycp @clientdir@/ldap-server_*.ycp @moduledir@/LdapServer.* @moduledir@/YaPI/LdapServer.pm @desktopdir@/ldap-server.desktop +@plugindir@/libpy2ag_slapdconfig.* @schemadir@/autoyast/rnc/ldap-server.rnc @scrconfdir@/* -@agentdir@/* %doc @docdir@ -- 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] r48657 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.cc lib/slapd-config.cpp lib/slapd-config.h
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:06 2008 New Revision: 48657 URL: http://svn.opensuse.org/viewcvs/yast?rev=48657&view=rev Log: Implement logging callback, get rid of stderr/stdout logging Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/slapd-config.cpp trunk/ldap-server/src/lib/slapd-config.h Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 16:01:06 2008 @@ -46,9 +46,17 @@ return toupper(c1) == toupper(c2); } + +static void y2LogCallback( int level, const std::string &msg, + const char* file=0, const int line=0, const char* function=0) +{ + y2_logger(LOG_MILESTONE, "libslapdconfig", file, line, function, "%s", msg.c_str()); +} + SlapdConfigAgent::SlapdConfigAgent() { y2milestone("SlapdConfigAgent::SlapdConfigAgent"); + OlcConfig::setLogCallback(y2LogCallback); // LDAPConnection *lc = new LDAPConnection("ldap://localhost"); // lc->bind("cn=config", "secret"); // olc = OlcConfig(lc); Modified: trunk/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Fri Jun 27 16:01:06 2008 @@ -1,3 +1,13 @@ +/* + * slapd-config.cpp + * + * A library for accessing OpenLDAP's configuration backend + * + * Author: Ralf Haferkamp <rhafer(a)suse.de> + * + * $Id$ + */ + #include <LDAPConnection.h> #include <LDAPResult.h> #include <string> @@ -9,6 +19,19 @@ #include <LdifWriter.h> #include "slapd-config.h" + + +static void defaultLogCallback( int level, const std::string &msg, + const char* file=0, const int line=0, const char* function=0) +{ + std::cerr << msg << std::endl; +} + +SlapdConfigLogCallback *OlcConfig::logCallback = defaultLogCallback; + +#define log_it( level, string ) \ + OlcConfig::logCallback( level, string, __FILE__, __LINE__ , __FUNCTION__ ) + static bool nocase_compare( char c1, char c2){ return toupper(c1) == toupper(c2); } @@ -28,7 +51,6 @@ } return index; } - static bool strCaseIgnoreEquals(const std::string &s1, const std::string &s2) { if(s1.size() == s2.size()){ @@ -40,6 +62,7 @@ return false; } + OlcDatabase::OlcDatabase( const LDAPEntry& le=LDAPEntry()) : OlcConfigEntry(le) { std::string type(this->getStringValue("olcdatabase")); @@ -57,7 +80,7 @@ void OlcDatabase::updateEntryDn() { - std::cerr << "updateEntryDN()" << std::endl; + log_it(0, "updateEntryDN()"); std::ostringstream dn, name; name << "{" << entryIndex << "}" << m_type; dn << "olcDatabase=" << name.str() << ",cn=config" ; @@ -76,7 +99,7 @@ { std::string::size_type pos = indexString.find_first_of(" \t"); attr = indexString.substr(0, pos); - std::cout << "AttributeType: <" << attr << ">" << std::endl; + log_it( 0, "AttributeType: " + attr ); if ( pos != std::string::npos ) { pos = indexString.find_first_not_of(" \t", pos); if ( pos != std::string::npos ) { @@ -93,7 +116,7 @@ pos = indexes.find( ',', oldpos ); std::string index = indexes.substr( oldpos, (pos == std::string::npos ? std::string::npos : pos - oldpos) ); - std::cout << "Index: <" << index << ">" << std::endl; + log_it(0, std::string("Index: ") + index ); oldpos = indexes.find_first_not_of( ", ", pos ); if ( index == "pres" ) { idx.push_back(Present); @@ -133,7 +156,7 @@ std::string attrType; std::string indexes; splitIndexString(*i, attrType, indexes ); - std::cout << "Indexes: <" << indexes << ">" << std::endl; + log_it(0, "Indexes: " + indexes ); std::vector<IndexType> idx = indexString2Type(indexes); res.insert(make_pair(attrType, idx)); } @@ -190,7 +213,7 @@ indexString += "sub"; } } - std::cout << "indexString: '" << indexString << "'" << std::endl; + log_it(0, "indexString: '" + indexString + "'"); this->addStringValue( "olcDbIndex", indexString ); } @@ -263,7 +286,7 @@ OlcGlobalConfig::OlcGlobalConfig( const LDAPEntry &le) : OlcConfigEntry(le) { - std::cout << "OlcGlobalConfig::OlcGlobalConfig( const LDAPEntry &le) : OlcConfigEntry(le)" << std::endl; + log_it(0, "OlcGlobalConfig::OlcGlobalConfig( const LDAPEntry &le) : OlcConfigEntry(le)"); } @@ -277,11 +300,11 @@ std::istringstream iss(*i); int intlogValue; if ( iss >> intlogValue ) { - std::cerr << "IntegerValue " << *i << std::endl; + log_it(0,"IntegerValue " + *i ); } else { - std::cerr << "StringValue " << *i << std::endl; + log_it(0,"StringValue " + *i ); lvls.push_back(*i); } } @@ -387,7 +410,7 @@ OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e) : OlcConfigEntry(e) { - std::cout << "OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e) : OlcConfigEntry(e)" << std::endl; + log_it( 0, "OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e) : OlcConfigEntry(e)"); std::string name(this->getStringValue("cn")); if ( name[0] == '{' ) { @@ -402,7 +425,7 @@ } OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e1, const LDAPEntry &e2) : OlcConfigEntry(e1, e2) { - std::cout << "OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e) : OlcConfigEntry(e)" << std::endl; + log_it(0, "OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e) : OlcConfigEntry(e)"); std::string name(this->getStringValue("cn")); entryIndex = splitIndexFromString( name, m_name ); } @@ -436,7 +459,7 @@ OlcTlsSettings OlcGlobalConfig::getTlsSettings() const { - std::cout << "OlcTlsSettings OlcGlobalConfig::getTlsSettings() const " << std::endl; + log_it(0, "OlcTlsSettings OlcGlobalConfig::getTlsSettings() const "); return OlcTlsSettings( *this ); } @@ -531,27 +554,27 @@ { if ( OlcConfigEntry::isGlobalEntry(e) ) { - std::cerr << "creating OlcGlobalConfig" << std::endl; + log_it(0,"creating OlcGlobalConfig" ); return new OlcGlobalConfig(e); } else if ( OlcConfigEntry::isScheamEntry(e) ) { - std::cerr << "creating OlcSchemaConfig" << std::endl; + log_it(0,"creating OlcSchemaConfig" ); return new OlcSchemaConfig(e); } else if ( OlcConfigEntry::isDatabaseEntry(e) ) { - std::cerr << "creating OlcDatabase" << std::endl; + log_it(0,"creating OlcDatabase" );; return OlcDatabase::createFromLdapEntry(e); } else if ( OlcConfigEntry::isOverlayEntry(e) ) { - std::cerr << "creating OlcOverlay" << std::endl; + log_it(0,"creating OlcOverlay"); return new OlcConfigEntry(e); } else { - std::cerr << "unknown Config Object" << std::endl; + log_it(0,"unknown Config Object" ); return 0; } } @@ -595,7 +618,7 @@ OlcOverlay::OlcOverlay( const LDAPEntry& e) : OlcConfigEntry(e) { - std::cerr << "OlcOverlay::OlcOverlay()" << std::endl; + log_it(0,"OlcOverlay::OlcOverlay()" ); std::string type(this->getStringValue("olcoverlay")); entryIndex = splitIndexFromString( type, m_type ); } @@ -718,12 +741,12 @@ { if ( OlcDatabase::isBdbDatabase( e ) ) { - std::cerr << "creating OlcBbdDatabase()" << std::endl; + log_it(0,"creating OlcBbdDatabase()" ); return new OlcBdbDatabase(e); } else { - std::cerr << "creating OlcDatabase()" << std::endl; + log_it(0,"creating OlcDatabase()" ); return new OlcDatabase(e); } } @@ -756,7 +779,7 @@ void OlcConfigEntry::setStringValue(const std::string &type, const std::string &value) { - std::cerr << "setStringValue() " << type << " " << value << std::endl; + log_it(0,"setStringValue() " + type + " " + value); if ( value.empty() ) { m_dbEntryChanged.delAttribute(type); @@ -821,11 +844,11 @@ LDAPModList OlcConfigEntry::entryDifftoMod() const { LDAPAttributeList::const_iterator i = m_dbEntry.getAttributes()->begin(); LDAPModList modifications; - std::cout << "Old Entry DN: " << m_dbEntry.getDN() << std::endl; - std::cout << "New Entry DN: " << m_dbEntryChanged.getDN() << std::endl; + log_it(0, "Old Entry DN: " + m_dbEntry.getDN()); + log_it(0,"New Entry DN: " + m_dbEntryChanged.getDN()); for(; i != m_dbEntry.getAttributes()->end(); i++ ) { - std::cout << i->getName() << std::endl; + log_it(0,i->getName()); const LDAPAttribute *changedAttr = m_dbEntryChanged.getAttributeByName(i->getName()); if ( changedAttr ) { StringList::const_iterator j = i->getValues().begin(); @@ -843,7 +866,7 @@ if ( deleted ) { delValues.add(*j); - std::cout << "Value deleted: " << *j << std::endl; + log_it(0,"Value deleted: " + *j ); } } j = changedAttr->getValues().begin(); @@ -853,7 +876,7 @@ StringList::const_iterator k = i->getValues().begin(); for( ; k != i->getValues().end(); k++ ) { if ( *k == *j ) { - std::cout << "Value unchanged: " << *k << std::endl; + log_it(0,"Value unchanged: " + *k ); added = false; break; } @@ -861,13 +884,13 @@ if ( added ) { addValues.add(*j); - std::cout << "Value added: " << *j << std::endl; + log_it(0,"Value added: " + *j); } } bool replace = false; if ( delValues.size() > 0 ) { if ( (addValues.size() > 0) && ( (int)delValues.size() == i->getNumValues()) ) { - std::cout << "All Values deleted, this is a replace" << std::endl; + log_it(0,"All Values deleted, this is a replace" ); modifications.addModification( LDAPModification( LDAPAttribute(i->getName(), addValues), LDAPModification::OP_REPLACE) @@ -887,7 +910,7 @@ ); } } else { - std::cout << "removed Attribute: " << i->getName() << std::endl; + log_it(0,"removed Attribute: " + i->getName() ); modifications.addModification( LDAPModification( LDAPAttribute(i->getName()), LDAPModification::OP_DELETE) @@ -897,10 +920,10 @@ i = m_dbEntryChanged.getAttributes()->begin(); for(; i != m_dbEntryChanged.getAttributes()->end(); i++ ) { - std::cout << i->getName() << std::endl; + log_it(0,i->getName() ); const LDAPAttribute *old = m_dbEntry.getAttributeByName(i->getName()); if (! old ) { - std::cout << "Attribute added: " << i->getName() << std::endl; + log_it(0,"Attribute added: " + i->getName()); if (! i->getValues().empty() ) { modifications.addModification( @@ -926,11 +949,11 @@ sr = m_lc->search( "cn=config", LDAPConnection::SEARCH_BASE); dbEntry = sr->getNext(); } catch (LDAPException e) { - std::cout << e << std::endl; + log_it(0, e.getResultMsg() + ": " + e.getServerMsg() ); throw; } if ( dbEntry ) { - std::cout << "Got GlobalConfig: " << dbEntry->getDN() << std::endl; + log_it(0,"Got GlobalConfig: " + dbEntry->getDN() ); boost::shared_ptr<OlcGlobalConfig> gc( new OlcGlobalConfig(*dbEntry) ); return gc; } @@ -944,7 +967,7 @@ LDAPModList ml = olcg.entryDifftoMod(); m_lc->modify( olcg.getDn(), &ml ); } catch (LDAPException e) { - std::cout << e << std::endl; + log_it(0, e.getResultMsg() + ": " + e.getServerMsg() ); throw; } } @@ -962,11 +985,11 @@ if ( ! ml.empty() ) { m_lc->modify( oce.getDn(), &ml ); } else { - std::cout << oce.getDn() << ": no changes" << std::endl; + log_it(0,oce.getDn() + ": no changes" ); } } } catch (LDAPException e) { - std::cout << e << std::endl; + log_it(0, e.getResultMsg() + e.getServerMsg() ); throw; } } @@ -981,21 +1004,21 @@ while ( (dbEntry = sr->getNext()) != 0 ) { std::string dbDn(dbEntry->getDN()); - std::cout << "Got Database Entry: " << dbDn << std::endl; + log_it(0,"Got Database Entry: " + dbDn); boost::shared_ptr<OlcDatabase> olce(OlcDatabase::createFromLdapEntry(*dbEntry)); LDAPSearchResults *overlaySearchRes = m_lc->search( dbDn, LDAPConnection::SEARCH_ONE, "objectclass=olcOverlayConfig" ); LDAPEntry *overlayEntry; while ( (overlayEntry = overlaySearchRes->getNext()) != 0 ) { - std::cout << "Got Overlay: " << overlayEntry->getDN() << std::endl; + log_it(0,"Got Overlay: " + overlayEntry->getDN() ); boost::shared_ptr<OlcOverlay> overlay(OlcOverlay::createFromLdapEntry(*overlayEntry) ); olce->addOverlay(overlay); } res.push_back(olce); } } catch (LDAPException e ) { - std::cout << e << std::endl; + log_it(0, e.getResultMsg() + e.getServerMsg() ); throw; } return res; @@ -1011,21 +1034,26 @@ LDAPEntry *entry; while ( entry = sr->getNext() ) { - std::cout << "Got Schema Entry: " << entry->getDN() << std::endl; + log_it(0,"Got Schema Entry: " + entry->getDN() ); boost::shared_ptr<OlcSchemaConfig> olce(new OlcSchemaConfig(*entry)); res.push_back(olce); } } catch (LDAPException e ) { - std::cout << e << std::endl; + log_it(0, e.getResultMsg() + e.getServerMsg() ); throw; } return res; } +void OlcConfig::setLogCallback( SlapdConfigLogCallback *lcb ) +{ + OlcConfig::logCallback = lcb; +} + OlcTlsSettings::OlcTlsSettings( const OlcGlobalConfig &ogc ) : m_crlCheck(0), m_verifyCient(0) { - std::cout << "OlcTlsSettings::OlcTlsSettings( const OlcGlobalConfig &ogc )" << std::endl; + log_it(0,"OlcTlsSettings::OlcTlsSettings( const OlcGlobalConfig &ogc )" ); std::string value = ogc.getStringValue("olcTLSCRLCheck"); if ( value == "none" ) { @@ -1066,7 +1094,7 @@ void OlcTlsSettings::applySettings( OlcGlobalConfig &ogc ) const { - std::cout << "OlcTlsSettings::applySettings( OlcGlobalConfig &ogc )" << std::endl; + log_it(0,"OlcTlsSettings::applySettings( OlcGlobalConfig &ogc )" ); ogc.setStringValue("olcTlsCaCertificatePath", m_caCertDir); ogc.setStringValue("olcTlsCaCertificateFile", m_caCertFile); ogc.setStringValue("olcTlsCertificateFile", m_certFile); @@ -1140,56 +1168,3 @@ m_crlFile = file; } -/* -int main(char** argv, int argc) -{ - LDAPConnection lc("localhost"); - LDAPSearchResults *sr; - LDAPEntry *dbEntry; - try { - lc.bind("cn=config","secret"); - sr = lc.search( "olcdatabase={1}bdb,cn=config", lc.SEARCH_BASE); - dbEntry = sr->getNext(); - } catch (LDAPException e) { - std::cout << e << std::endl; - exit(-1); - } - if ( dbEntry ) { - std::cout << "Got DBEntry: " << dbEntry->getDN() << std::endl; - OlcBdbDatabase db(*dbEntry); - OlcBdbDatabase::IndexMap idx = db.getDatabaseIndexes(); - OlcBdbDatabase::IndexMap::const_iterator i = idx.find("cn"); - - std::cout << "Idx: " << i->second[0] << " " << OlcBdbDatabase::Eq << std::endl; - } - try { - // read globalConfig - sr = lc.search( "cn=config", lc.SEARCH_BASE); - dbEntry = sr->getNext(); - } catch (LDAPException e) { - std::cout << e << std::endl; - exit(-1); - } - if ( dbEntry ) { - std::cout << "Got GlobalConfig: " << dbEntry->getDN() << std::endl; - OlcGlobalConfig gc(*dbEntry); -// gc.getLogLevel(); -// gc.setLogLevel("stats stats2"); - std::cout << "Config file: " << gc.getStringValue("olcConfigFile") << std::endl; - std::cout << "args file: " << gc.getStringValue("olcArgsFile") << std::endl; - gc.setStringValue("olcArgsFile", "/tmp/slapd.args" ); - try { - LDAPModList ml = gc.entryDifftoMod(); - lc.modify( dbEntry->getDN(), &ml ); - } catch (LDAPException e) { - std::cout << e << std::endl; - exit(-1); - } - } else { - std::cout << "no Entry" << std::endl; - } - - - -} -*/ Modified: trunk/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.h (original) +++ trunk/ldap-server/src/lib/slapd-config.h Fri Jun 27 16:01:06 2008 @@ -1,3 +1,14 @@ +/* + * slapd-config.h + * + * A library for accessing OpenLDAP's configuration backend + * + * Author: Ralf Haferkamp <rhafer(a)suse.de> + * + * $Id$ + * + */ + #ifndef BACK_CONFIG_TEST_H #define BACK_CONFIG_TEST_H #include <LDAPConnection.h> @@ -11,6 +22,9 @@ #include <LDAPAttrType.h> #include <boost/shared_ptr.hpp> +typedef void (SlapdConfigLogCallback) (int level, const std::string &msg, + const char* file=0, const int line=0, const char* function=0 ); + class OlcConfigEntry { public: @@ -22,7 +36,9 @@ inline OlcConfigEntry() : m_dbEntry(), m_dbEntryChanged() {} inline OlcConfigEntry(const LDAPEntry& le) : m_dbEntry(le), m_dbEntryChanged(le) {} - inline OlcConfigEntry(const LDAPEntry& le, const LDAPEntry& le1) : m_dbEntry(le), m_dbEntryChanged(le1) {} + inline OlcConfigEntry(const LDAPEntry& le, const LDAPEntry& le1) + : m_dbEntry(le), m_dbEntryChanged(le1) {} + inline std::string getDn() const { return m_dbEntry.getDN(); } @@ -232,6 +248,9 @@ void setGlobals( OlcGlobalConfig &olcg); void updateEntry( const OlcConfigEntry &oce ); + static SlapdConfigLogCallback *logCallback; + static void setLogCallback( SlapdConfigLogCallback *lcb ); + private: LDAPConnection *m_lc; }; -- 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] r48656 - in /trunk/ldap-server: src/LdapServer.pm src/LdapServerConf.ycp src/Makefile.am src/dialogs.ycp src/ldap-server_proposal.ycp yast2-ldap-server.spec.in
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:01 2008 New Revision: 48656 URL: http://svn.opensuse.org/viewcvs/yast?rev=48656&view=rev Log: - obsoleted LdapServerConf.ycp - adjust filesystem ACLs on Certificates Removed: trunk/ldap-server/src/LdapServerConf.ycp Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/Makefile.am trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/ldap-server_proposal.ycp trunk/ldap-server/yast2-ldap-server.spec.in Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 16:01:01 2008 @@ -29,7 +29,8 @@ YaST::YCP::Import ("Service"); my %error = ( msg => undef, details => undef ); - +my $usingDefaults = 1; +my $configured = 0; my $usesBackConfig = 0; my $slapdConfChanged = 0; my $serviceEnabled = 0; @@ -398,6 +399,7 @@ SCR->Execute('.ldapserver.commitChanges' ); } sleep(1); + $configured = $ret; return $ret; } @@ -460,6 +462,17 @@ return (); } +BEGIN { $TYPEINFO{Configured} = ["function", "boolean"]; } +sub Configured +{ + return YaST::YCP::Boolean($configured); +} + +BEGIN { $TYPEINFO{UseDefaults} = ["function", "boolean"]; } +sub UseDefaults +{ + return YaST::YCP::Boolean($usingDefaults); +} ## # Return packages needed to be installed and removed during # Autoinstallation to insure module has all needed software @@ -513,8 +526,8 @@ return $registerSlp; } -BEGIN { $TYPEINFO {SetSlpEnabled} = ["function", "boolean", "boolean"]; } -sub SetSlpEnabled { +BEGIN { $TYPEINFO {SetSLPEnabled} = ["function", "boolean", "boolean"]; } +sub SetSLPEnabled { my $self = shift; y2milestone("SetSlpEnabled"); $registerSlp = shift; @@ -607,6 +620,31 @@ return 1; } +BEGIN { $TYPEINFO {SetTlsConfigCommonCert} = ["function", "boolean" ]; } +sub SetTlsConfigCommonCert +{ + my $self = shift; + my $ret = SCR->Execute(".target.bash", + "/usr/bin/setfacl -m u:ldap:r /etc/ssl/servercerts/serverkey.pem"); + if($ret != 0) { + return $self->SetError(_("Can not set a filesystem acl on the private key"), + "setfacl -m u:ldap:r /etc/ssl/servercerts/serverkey.pem failed.\n". + "Do you have filesystem acl support disabled?" ); + return 0; + } + + my $tlsSettings = { + "certKeyFile" => "/etc/ssl/servercerts/serverkey.pem", + "certFile" => "/etc/ssl/servercerts/servercert.pem", + "caCertFile" => "/etc/ssl/certs/YaST-CA.pem", + "caCertDir" => "", + "crlFile" => "", + "crlCheck" => 0, + "verifyClient" => 0 + }; + return $self->SetTlsConfig( $tlsSettings ); +} + BEGIN { $TYPEINFO {MigrateSlapdConf} = ["function", "boolean"]; } sub MigrateSlapdConf { @@ -683,6 +721,7 @@ $self->InitDbDefaults(); } y2milestone(Data::Dumper->Dump([\%dbDefaults])); + $usingDefaults = 1; return \%dbDefaults; } @@ -742,6 +781,7 @@ sub ReadFromDefaults { my $self = shift; + my $pwHash = $self->HashPassword($dbDefaults{'pwenctype'}, $dbDefaults{'rootpw_clear'} ); my $database = { 'type' => 'bdb', 'suffix' => $dbDefaults{'basedn'}, @@ -808,6 +848,7 @@ push @added_databases, { suffix => $dbDefaults{'basedn'}, rootdn => $dbDefaults{'rootdn'}, rootpw => $dbDefaults{'rootpw_clear'} }; + $usingDefaults = 0; return 1; } Modified: trunk/ldap-server/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/Makefile.am?rev=… ============================================================================== --- trunk/ldap-server/src/Makefile.am (original) +++ trunk/ldap-server/src/Makefile.am Fri Jun 27 16:01:01 2008 @@ -21,8 +21,7 @@ ldap-server.desktop module_DATA = \ - LdapServer.pm \ - LdapServerConf.ycp + LdapServer.pm EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Fri Jun 27 16:01:01 2008 @@ -15,7 +15,6 @@ import "Label"; import "Wizard"; import "LdapServer"; -//import "LdapServerConf"; import "HTML"; import "DNS"; import "CaMgm"; @@ -298,13 +297,6 @@ Wizard::SetContentsButtons( caption, dlg_propose, HELPS["propose"]:"no proposal help text", Label::BackButton(), Label::NextButton() ); -// if( !LdapServerConf::proposal_changed ) -// { -// /* notify message */ -// Popup::Notify( _("Changing anything in this dialog disables the automatic -//generation of base DN, root DN, and LDAP password. -//") ); -// } if ( ! (boolean)defaults["serviceEnabled"]:false ) { UI::ChangeWidget( `id( `te_basedn ), `Enabled, false ); Modified: trunk/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server_prop… ============================================================================== --- trunk/ldap-server/src/ldap-server_proposal.ycp (original) +++ trunk/ldap-server/src/ldap-server_proposal.ycp Fri Jun 27 16:01:01 2008 @@ -15,7 +15,6 @@ textdomain "ldap-server"; import "LdapServer"; -import "LdapServerConf"; import "Ldap"; import "HTML"; import "Label"; @@ -47,9 +46,9 @@ map <string,any> defaults = nil; - if( force_reset || !LdapServerConf::proposal_changed ) + if( force_reset || LdapServer::UseDefaults() ) { - if (force_reset && LdapServerConf::wroteDatabase) + if ( force_reset && LdapServer::Configured() ) { /* error popup */ Report::Warning( _("The LDAP database has already been created. You can change the settings later in the installed system.") ); @@ -88,7 +87,7 @@ warning = _("Unable to retrieve the system root password. Set an LDAP server password to continue."); warning_level = `blocker; } - // Try to get Firewall status + // Try to get Firewall status string fw_text = ""; if ( SuSEFirewall::GetEnableService()) { list<string> known_interfaces = SuSEFirewall::GetListOfKnownInterfaces(); @@ -124,7 +123,7 @@ _("LDAP Password: ") + rootPWString ] ) + _("Start LDAP Server: ") + HTML::Bold( _("YES") ) + HTML::Newline() + - _("Register at SLP Daemon: ") + HTML::Bold( LdapServerConf::registerSLP ? _("YES") : _("NO") ) + + _("Register at SLP Daemon: ") + HTML::Bold( LdapServer::ReadSLPEnabled() ? _("YES") : _("NO") ) + HTML::Newline() + fw_text; } else { @@ -142,7 +141,7 @@ else if(func == "AskUser") { map stored = nil; symbol seq = nil; - if( LdapServerConf::wroteDatabase ) + if( LdapServer::Configured() ) { /* error popup */ Report::Warning( _("The LDAP database has already been created. You can change the settings later in the installed system.") ); @@ -171,8 +170,7 @@ } /* write the proposal */ else if(func == "Write") { - if( LdapServerConf::wroteDatabase ) return ret; - LdapServerConf::wroteDatabase = true; + if( LdapServer::Configured() ) return ret; if( LdapServer::ReadServiceEnabled() ) { @@ -195,58 +193,20 @@ Progress::off(); LdapServer::ReadFromDefaults(); LdapServer::SetServiceEnabled( true ); -// LdapServer::WriteLoglevel( 0 ); + LdapServer::SetLogLevels( ["none"] ); Progress::on(); -// map ldap_defaults = Ldap::Export(); -// y2debug( "ldap settings map: %1", ldap_defaults ); -// -// //map bash_out = (map<string,any>)SCR::Execute( .target.bash_output, "/bin/hostname --long" ); -// //string fqdn = (string)bash_out["stdout"]:""; -// //fqdn = substring( fqdn, 0, size(fqdn)-1 ); -// -// ldap_defaults["ldap_server"] = "localhost"; -// ldap_defaults["base_config_dn"] = "ou=ldapconfig,"+LdapServerConf::baseDN; -// ldap_defaults["bind_dn"] = LdapServerConf::rootDN; -// ldap_defaults["ldap_domain"] = LdapServerConf::baseDN; -// ldap_defaults["ldap_tls"] = false; -// ldap_defaults["file_server"] = true; -// ldap_defaults["create_ldap"] = true; -// -// if( LdapServerConf::useCommonCA ) -// { -// if( !YaPI::LdapServer::CheckCommonServerCertificate() ) -// { -// /* Error popup */ -// Report::Error( _("OpenLDAP Server: Common server certificate not available. -//StartTLS is disabled.") ); -// LdapServerConf::useCommonCA = false; -// ldap_defaults["ldap_tls"] = false; -// } else -// { -// LdapServer::WriteConfigureCommonServerCertificate( true ); -// ldap_defaults["ldap_tls"] = true; -// } -// } -// -// LdapServer::WriteSLPEnabled( LdapServerConf::registerSLP ); -// -// LdapServer::AddDatabase( $[ "database":"bdb", -// "suffix": LdapServerConf::baseDN, -// "rootdn" : LdapServerConf::rootDN, -// "passwd" : LdapServerConf::rootPW, -// "cryptmethod" : LdapServerConf::enctype, -// "directory" : "/var/lib/ldap" -// ] ); -// y2debug( "ldap settings map after setting: %1", ldap_defaults ); -// Ldap::SetDefaults( ldap_defaults ); -// Ldap::SetBindPassword( LdapServerConf::rootPW ); -// } -// + if( !LdapServer::HaveCommonServerCertificate() ) + { + Report::Error( _("OpenLDAP Server: Common server certificate not available. +StartTLS is disabled.") ); + } + else + { + LdapServer::SetTlsConfigCommonCert(); + } + LdapServer::SetSLPEnabled( true ); LdapServer::Write(); } -// -// //be paranoid -// LdapServerConf::rootPW = ""; } /* unknown function */ else { Modified: trunk/ldap-server/yast2-ldap-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/yast2-ldap-server.sp… ============================================================================== --- trunk/ldap-server/yast2-ldap-server.spec.in (original) +++ trunk/ldap-server/yast2-ldap-server.spec.in Fri Jun 27 16:01:01 2008 @@ -27,7 +27,6 @@ @clientdir@/ldap-server.ycp @clientdir@/ldap-server_*.ycp @moduledir@/LdapServer.* -@moduledir@/LdapServerConf.* @moduledir@/YaPI/LdapServer.pm @desktopdir@/ldap-server.desktop @schemadir@/autoyast/rnc/ldap-server.rnc -- 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] r48655 - /trunk/ldap-server/src/ldap-server_proposal.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:56 2008 New Revision: 48655 URL: http://svn.opensuse.org/viewcvs/yast?rev=48655&view=rev Log: Made installation proposal working again Modified: trunk/ldap-server/src/ldap-server_proposal.ycp Modified: trunk/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server_prop… ============================================================================== --- trunk/ldap-server/src/ldap-server_proposal.ycp (original) +++ trunk/ldap-server/src/ldap-server_proposal.ycp Fri Jun 27 16:00:56 2008 @@ -15,7 +15,6 @@ textdomain "ldap-server"; import "LdapServer"; -import "YaPI::LdapServer"; import "LdapServerConf"; import "Ldap"; import "HTML"; @@ -45,6 +44,7 @@ string warning = nil; symbol warning_level = nil; boolean force_reset = param["force_reset"]:false; + map <string,any> defaults = nil; if( force_reset || !LdapServerConf::proposal_changed ) @@ -59,65 +59,35 @@ if (!Package::Installed ("openldap2")) { y2milestone ("Openldap2 is not installed. --> service disabled"); - // LdapServer::WriteServiceEnabled (false); + LdapServer::SetServiceEnabled (false); } else { - //LdapServer::WriteServiceEnabled( true ); + LdapServer::SetServiceEnabled( true ); } - map bash_out = (map<string,any>)SCR::Execute( .target.bash_output, "/bin/hostname -d" ); - string domain = (string)bash_out["stdout"]:""; - domain = substring( domain, 0, size(domain)-1 ); - if (size (domain) <= 0) - { - domain = "site"; - } - y2milestone( "domain is '%1'", domain ); - list<string> dnlist = splitstring( domain, "." ); - y2milestone( "dnlist is '%1'", dnlist ); - string new_basedn = ""; - foreach( string dn, dnlist, { new_basedn = new_basedn + "dc=" + dn + ","; } ); - - LdapServerConf::baseDN = substring( new_basedn, 0, size( new_basedn )-1 ); - /* XXX: hack to resolve bug #44335: - * a failed 'hostname' causes the initial baseDN to be empty, thus the rootDN has a trailing comma. - * In dialogs.ycp, when the user enters a baseDN and leaves 'append Base DN' checked, another comma - * is put between rootDN and the baseDN part, leading to an invalid rootDN. To resolve this, the - * baseDN and comma is only appended to the initial rootDN if 'hostname' succeeded, that is, dnlist - * at least 1 element. - */ - //LdapServerConf::rootDN = "cn=Administrator,"+LdapServerConf::baseDN; - LdapServerConf::rootDN = "cn=Administrator"; - if( size( dnlist ) > 0 ) - { - LdapServerConf::rootDN = LdapServerConf::rootDN + "," + LdapServerConf::baseDN; - } - LdapServerConf::rootPW = Users::GetRootPassword(); - LdapServerConf::enctype = "SSHA"; - //LdapServer::WriteUseRootPW( true ); + defaults = LdapServer::GetInitialDefaults(); + defaults["rootpw_clear"] = Users::GetRootPassword(); + LdapServer::SetInitialDefaults(defaults); } } //y2error( "sysconfig var is '%1'", SCR::Read( .sysconfig.openldap.OPENLDAP_REGISTER_SLP ) ); - if( true ) // LdapServer::ReadServiceEnabled() ) + if( LdapServer::ReadServiceEnabled() ) { string rootPWString = ""; - if( LdapServerConf::rootPW == Users::GetRootPassword() ) + if( defaults["rootpw_clear"]:"" == Users::GetRootPassword() ) { - /*proposal password information*/ rootPWString = _("[root password]"); } else { - /*proposal password information*/ rootPWString = _("[manually set]"); } -// if( LdapServer::ReadUseRootPW() && Users::GetRootPassword() == "" ) -// { -// /* proposal error */ -// warning = _("Unable to retrieve the system root password. Set an LDAP server password to continue."); -// warning_level = `blocker; -// } + if( defaults["rootpw_clear"]:"" == "" ) + { + warning = _("Unable to retrieve the system root password. Set an LDAP server password to continue."); + warning_level = `blocker; + } // Try to get Firewall status string fw_text = ""; if ( SuSEFirewall::GetEnableService()) { @@ -149,8 +119,8 @@ } proposal = _("LDAP Server Configuration:") + HTML::Newline() + - HTML::List( [ _("Base DN: ") + LdapServerConf::baseDN, - _("Root DN: ") + LdapServerConf::rootDN, + HTML::List( [ _("Base DN: ") + defaults["basedn"]:"", + _("Root DN: ") + defaults["rootdn"]:"", _("LDAP Password: ") + rootPWString ] ) + _("Start LDAP Server: ") + HTML::Bold( _("YES") ) + HTML::Newline() + @@ -204,37 +174,29 @@ if( LdapServerConf::wroteDatabase ) return ret; LdapServerConf::wroteDatabase = true; -// if( LdapServer::ReadServiceEnabled() ) -// { -// /* ensure openldap2 package is installed */ -// if( !Package::Install( "openldap2" ) ) -// { -// if( !Package::Available( "openldap2" ) ) { -// // translators: error popup before aborting the module -// Popup::Error( sformat( _("The package '%1' is not available. -//YaST2 cannot continue the configuration -//without installing the package."), "openldap2" ) ); -// } else { -// // translators: error popup before aborting the module -// Popup::Error (_("YaST2 cannot continue the configuration -//without installing the required packages.")); -// } -// -// return ret; -// } -// } - - //string rootPW = ""; - + if( LdapServer::ReadServiceEnabled() ) + { + /* ensure openldap2 package is installed */ + if( !Package::Install( "openldap2" ) ) + { + if( !Package::Available( "openldap2" ) ) { + // translators: error popup before aborting the module + Popup::Error( sformat( _("The package '%1' is not available. +YaST2 cannot continue the configuration +without installing the package."), "openldap2" ) ); + } else { + // translators: error popup before aborting the module + Popup::Error (_("YaST2 cannot continue the configuration +without installing the required packages.")); + } -// if( LdapServer::ReadServiceEnabled() ) -// { -// Progress::off(); -// LdapServer::Read(); -// LdapServer::WriteServiceEnabled( true ); + return ret; + } + Progress::off(); + LdapServer::ReadFromDefaults(); + LdapServer::SetServiceEnabled( true ); // LdapServer::WriteLoglevel( 0 ); -// Ldap::Read(); -// Progress::on(); + Progress::on(); // map ldap_defaults = Ldap::Export(); // y2debug( "ldap settings map: %1", ldap_defaults ); // @@ -280,7 +242,8 @@ // Ldap::SetBindPassword( LdapServerConf::rootPW ); // } // -// LdapServer::Write(); + LdapServer::Write(); + } // // //be paranoid // LdapServerConf::rootPW = ""; -- 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] r48654 - /trunk/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:54 2008 New Revision: 48654 URL: http://svn.opensuse.org/viewcvs/yast?rev=48654&view=rev Log: improved logging Modified: trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 16:00:54 2008 @@ -516,7 +516,7 @@ BEGIN { $TYPEINFO {SetSlpEnabled} = ["function", "boolean", "boolean"]; } sub SetSlpEnabled { my $self = shift; - y2milestone("ReadServiceEnabled"); + y2milestone("SetSlpEnabled"); $registerSlp = shift; return 1; } @@ -768,24 +768,28 @@ my $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/core.ldif" ); if ( ! $rc ) { my $err = SCR->Error(".ldapserver"); + y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); $self->SetError( $err->{'summary'}, $err->{'description'} ); return $rc; } $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/cosine.ldif" ); if ( ! $rc ) { my $err = SCR->Error(".ldapserver"); + y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); $self->SetError( $err->{'summary'}, $err->{'description'} ); return $rc; } $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/inetorgperson.ldif" ); if ( ! $rc ) { my $err = SCR->Error(".ldapserver"); + y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); $self->SetError( $err->{'summary'}, $err->{'description'} ); return $rc; } $rc = SCR->Write(".ldapserver.schema.addFromSchemafile", "/etc/openldap/schema/rfc2307bis.schema" ); if ( ! $rc ) { my $err = SCR->Error(".ldapserver"); + y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); $self->SetError( $err->{'summary'}, $err->{'description'} ); return $rc; } -- 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] r48653 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc complex.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:50 2008 New Revision: 48653 URL: http://svn.opensuse.org/viewcvs/yast?rev=48653&view=rev Log: - reworked initial Schema loading to use ldif and schema Files directly instead of only adding include statements - add rfc2307bis by default Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/complex.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 16:00:50 2008 @@ -763,12 +763,35 @@ ] }; - @schema = ( "core", "cosine", "inetorgperson" ); - SCR->Execute('.ldapserver.initGlobals' ); - SCR->Execute('.ldapserver.initSchema', \@schema ); + SCR->Execute('.ldapserver.initSchema' ); + my $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/core.ldif" ); + if ( ! $rc ) { + my $err = SCR->Error(".ldapserver"); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return $rc; + } + $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/cosine.ldif" ); + if ( ! $rc ) { + my $err = SCR->Error(".ldapserver"); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return $rc; + } + $rc = SCR->Write(".ldapserver.schema.addFromLdif", "/etc/openldap/schema/inetorgperson.ldif" ); + if ( ! $rc ) { + my $err = SCR->Error(".ldapserver"); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return $rc; + } + $rc = SCR->Write(".ldapserver.schema.addFromSchemafile", "/etc/openldap/schema/rfc2307bis.schema" ); + if ( ! $rc ) { + my $err = SCR->Error(".ldapserver"); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return $rc; + } + SCR->Execute('.ldapserver.initDatabases', [ $frontenddb, $cfgdatabase, $database ] ); - my $rc = SCR->Read('.ldapserver.databases'); + $rc = SCR->Read('.ldapserver.databases'); if ( $dbDefaults{'defaultIndex'} == 1 ) { foreach my $idx ( @defaultIndexes ) Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 16:00:50 2008 @@ -180,12 +180,6 @@ else if ( path->component_str(0) == "initSchema" ) { schemaBase = boost::shared_ptr<OlcSchemaConfig>(new OlcSchemaConfig() ); - YCPList schemaList = arg->asList(); - for ( int i = 0; i < schemaList->size(); i++ ) - { - y2milestone("Schemafile to include: %s", schemaList->value(i)->asString()->value_cstr() ); - } - } else if ( path->component_str(0) == "initDatabases" ) { @@ -918,12 +912,14 @@ { LDAPEntry entry, oldEntry; entry = ldif.getEntryRecord(); + y2milestone("adding <%s> to SchemaList", entry.getDN().c_str() ); schema.push_back( boost::shared_ptr<OlcSchemaConfig>(new OlcSchemaConfig(oldEntry, entry)) ); } return YCPBoolean(true); } catch ( std::runtime_error e ) { + std::string errstring = "Error while parsing LDIF file: " + filename; lastError->add(YCPString("summary"), - YCPString("Error while parsing LDIF file") ); + YCPString(errstring) ); lastError->add(YCPString("description"), YCPString(std::string( e.what() ) ) ); return YCPBoolean(false); @@ -1030,15 +1026,15 @@ YCPString SlapdConfigAgent::ConfigToLdif() const { y2milestone("ConfigToLdif"); - OlcDatabaseList::const_iterator i = databases.begin(); std::ostringstream ldif; ldif << globals->toLdif() << std::endl; ldif << schemaBase->toLdif() << std::endl; - LdifWriter writer(ldif); - writer.writeIncludeRecord("/etc/openldap/schema/core.ldif"); - writer.writeIncludeRecord("/etc/openldap/schema/cosine.ldif"); - writer.writeIncludeRecord("/etc/openldap/schema/inetorgperson.ldif"); - ldif << std::endl; + OlcSchemaList::const_iterator j; + for ( j = schema.begin(); j != schema.end() ; j++ ) + { + ldif << (*j)->toLdif() << std::endl; + } + OlcDatabaseList::const_iterator i = databases.begin(); for ( ; i != databases.end(); i++ ) { ldif << (*i)->toLdif() << std::endl; Modified: trunk/ldap-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/complex.ycp (original) +++ trunk/ldap-server/src/complex.ycp Fri Jun 27 16:00:50 2008 @@ -469,8 +469,11 @@ } else if ( ret == `next ) { - LdapServer::ReadFromDefaults(); - ret = `next; + if ( ! LdapServer::ReadFromDefaults() ) + { + DisplayError( LdapServer::GetError() ); + ret = `abort; + } break; } else if ( ret == `back ) -- 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] r48652 - /trunk/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:46 2008 New Revision: 48652 URL: http://svn.opensuse.org/viewcvs/yast?rev=48652&view=rev Log: create database base-object after writing proposal Modified: trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 16:00:46 2008 @@ -122,6 +122,8 @@ } ); +my @added_databases = (); + ## # Read all ldap-server settings # @return true on success @@ -196,6 +198,91 @@ return 1; } +sub CreateBaseObjects() +{ + my $self = shift; + foreach my $db (@added_databases ) + { + y2milestone("creating base object for ". $db->{'suffix'} ); + my $object = X500::DN->ParseRFC2253($db->{'suffix'}); + if(! defined $object) { + y2error("Error while parsing base dn"); + return 0; + } + my @attr = $object->getRDN($object->getRDNs()-1)->getAttributeTypes(); + my $val = $object->getRDN($object->getRDNs()-1)->getAttributeValue($attr[0]); + if(!defined $attr[0] || !defined $val) + { + y2error("Error while extracting RDN values"); + return 0; + } + my $entry = {}; + + if( lc($attr[0]) eq "ou") { + $entry = { + "objectClass" => [ "organizationalUnit" ], + "ou" => $val, + } + } elsif( lc($attr[0]) eq "o") { + $entry = { + "objectClass" => [ "organization" ], + "o" => $val, + } + } elsif( lc($attr[0]) eq "c") { + if($val !~ /^\w{2}$/) { + y2error("The countryName must be an ISO-3166 country 2-letter code."); + return 0; + } + $entry = { + "objectClass" => [ "country" ], + "c" => $val, + } + } elsif( lc($attr[0]) eq "l") { + $entry = { + "objectClass" => [ "locality" ], + "l" => $val, + } + } elsif( lc($attr[0]) eq "st") { + $entry = { + "objectClass" => [ "locality" ], + "st" => $val, + } + } elsif( lc($attr[0]) eq "dc") { + $entry = { + "objectClass" => [ "organization", "dcObject" ], + "dc" => $val, + "o" => $val, + } + } else { + y2error("First part of suffix must be c=, st=, l=, o=, ou= or dc=."); + return 0; + } + + if(! SCR->Execute(".ldap", {"hostname" => 'localhost', + "port" => 389})) { + y2error("LDAP init failed"); + return 0; + } + + my $ldapERR; + + if (! SCR->Execute(".ldap.bind", {"bind_dn" => $db->{'rootdn'}, + "bind_pw" => $db->{'rootpw'}}) ) { + $ldapERR = SCR->Read(".ldap.error"); + y2error( "LDAP bind failed" ); + y2error( $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); + return 0; + } + + if (! SCR->Write(".ldap.add", { dn => $db->{'suffix'} } , $entry)) { + my $ldapERR = SCR->Read(".ldap.error"); + y2error("Can not add base entry."); + y2error( $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); + } + y2milestone("base entry added"); + } + return 1; +} ## # Write all ldap-server settings # @return true on success @@ -210,8 +297,9 @@ my $progressItems = [ _("Writing Startup Configuration"), _("Cleaning up config directory"), _("Creating Configuration"), - _("Starting OpenLDAP Server")]; - Progress->New("Writing OpenLDAP Server Configuration", "", 4, $progressItems, $progressItems, ""); + _("Starting OpenLDAP Server"), + _("Creating Base Objects") ]; + Progress->New("Writing OpenLDAP Server Configuration", "", 5, $progressItems, $progressItems, ""); Progress->NextStage(); @@ -296,7 +384,15 @@ Progress->Finish(); return 0; } - + Progress->NextStage(); + $rc = $self->CreateBaseObjects(); + if (! $rc ) + { + y2error("Error while creating base objects"); + $self->SetError( _("Creating base objects failed.") ); + Progress->Finish(); + return 0; + } Progress->Finish(); } else { SCR->Execute('.ldapserver.commitChanges' ); @@ -682,6 +778,9 @@ } y2milestone("Databases: ". Data::Dumper->Dump([$rc])); @databases = @{$rc}; + push @added_databases, { suffix => $dbDefaults{'basedn'}, + rootdn => $dbDefaults{'rootdn'}, + rootpw => $dbDefaults{'rootpw_clear'} }; return 1; } -- 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] r48651 - in /trunk/ldap-server/src: LdapServer.pm tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:43 2008 New Revision: 48651 URL: http://svn.opensuse.org/viewcvs/yast?rev=48651&view=rev Log: - Don't display "unknown" if a Database has no suffix (like frontend or config) ) - Only display "password policies" and "indexing" for bdb Databases Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 16:00:43 2008 @@ -696,10 +696,6 @@ my $tmp = { 'type' => $db->{'type'}, 'suffix' => $db->{'suffix'}, 'index' => $db->{'index'} }; - if (! $tmp->{'suffix'} ) - { - $tmp->{'suffix'} = "unknown"; - } push @{$ret}, $tmp; } y2milestone(Data::Dumper->Dump([$ret])); Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 16:00:43 2008 @@ -42,8 +42,6 @@ */ define string current_tree_item = ""; -//define void addDatabaseWidgetMap( string suffix, string item_map, integer index, boolean new_db ); - /********************************* ** callback handlers ** *********************************/ @@ -1195,7 +1193,7 @@ * tree generation functions ** *****************************************/ -void addDatabaseWidgetMap( string label, string item_name, integer index, boolean new_db ) +void addDatabaseWidgetMap( string type, string label, string item_name, integer index, boolean new_db ) { if( haskey( widget_map, item_name ) ) return; map<string, any> dbIndex = $[ @@ -1215,6 +1213,17 @@ ]; map<string,any> item_map = $[ "name" : label, + "index" : index, + "widget" : editBdbDatabase, + "new_db" : new_db, + "dynamic" : true, + "help_page" : "database_detail", + "cb_read" : ``( cb_read_db() ), + "cb_write" : ``( cb_write_db() ), + "cb_input" : ``( cb_input_db() ) + ]; + map<string,any> bdb_item_map = $[ + "name" : label, "children" : [ item_name + "_index", item_name + "_ppolicy" ], "index" : index, "widget" : editBdbDatabase, @@ -1226,9 +1235,17 @@ "cb_input" : ``( cb_input_db() ) ]; y2milestone( "adding database item '%1' as '%2'", label, item_name ); - widget_map[item_name] = item_map; - widget_map[item_name + "_index"] = dbIndex; - widget_map[item_name + "_ppolicy"] = dbPpolicy; + + if ( type == "bdb" ) + { + widget_map[item_name] = bdb_item_map; + widget_map[item_name + "_index"] = dbIndex; + widget_map[item_name + "_ppolicy"] = dbPpolicy; + } + else + { + widget_map[item_name] = item_map; + } widget_map["databases","children"] = add( widget_map["databases","children"]:[], item_name ); } @@ -1244,7 +1261,7 @@ foreach( map<string,string> db, dblist, { string tmp = sformat("%1 (%2)", db["suffix"]:"", db["type"]:"" ); string name = "database-" + tostring(i); - addDatabaseWidgetMap( tmp , name, tointeger(db["index"]:"0"), false ); + addDatabaseWidgetMap( db["type"]:"", tmp , name, tointeger(db["index"]:"0"), false ); i = i+1; } ); y2debug( "databases map is '%1'", (map<string,any>)widget_map["databases"]:$[] ); -- 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] r48650 - in /trunk/ldap-server/src: LdapServer.pm complex.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:40 2008 New Revision: 48650 URL: http://svn.opensuse.org/viewcvs/yast?rev=48650&view=rev Log: - Add some default ACLs to frontend - Set checkpoint for initial BDB database Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/complex.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 16:00:40 2008 @@ -21,7 +21,7 @@ use MIME::Base64; use X500::DN; use ycp; -use YaST::YCP qw(Boolean); +use YaST::YCP; our %TYPEINFO; @@ -84,6 +84,44 @@ my @databases = (); my @schema = (); +my @globalAcl = ( + { 'what' => + { 'filter' => undef, + 'attr' => undef, + 'dn' => + { + 'style' => "base", + 'dn' => "" + } + }, + 'who' => + [ + { 'whotype' => "all", + 'whovalue' => undef, + 'level' => "read", + 'priv' => undef + } + ] + }, + { 'what' => + { 'filter' => undef, + 'attr' => undef, + 'dn' => + { 'style' => "base", + 'dn' => "cn=Subschema" + } + }, + 'who' => + [ + { 'whotype' => "all", + 'whovalue' => undef, + 'level' => "read", + 'priv' => undef + } + ] + } +); + ## # Read all ldap-server settings # @return true on success @@ -226,8 +264,10 @@ "/usr/sbin/slapadd -F /etc/openldap/slapd.d -b cn=config -l $tmpfile" ); if ( $rc->{'exit'} ) { + $self->SetError( _("Error while populating the configurations database with \"slapadd\"."), + $rc->{'stderr'} ); y2error("Error during slapadd:" .$rc->{'stderr'}); - $ret = 0; + return 0; } } else @@ -557,6 +597,8 @@ my $defaults = shift; $defaults->{'serviceEnabled'} = YaST::YCP::Boolean($defaults->{'serviceEnabled'}); $defaults->{'slpRegister'} = YaST::YCP::Boolean($defaults->{'slpRegister'}); + $defaults->{'checkpoint'} = [ YaST::YCP::Integer($defaults->{'checkpoint'}->[0]), + YaST::YCP::Integer($defaults->{'checkpoint'}->[1]) ]; y2milestone("SetInitialDefaults: ". Data::Dumper->Dump([$defaults])); %dbDefaults = %$defaults; return 1; @@ -591,6 +633,8 @@ $dbDefaults{'pwenctype'} = "SSHA"; $dbDefaults{'entrycache'} = 10000; $dbDefaults{'idlcache'} = 10000; + $dbDefaults{'checkpoint'} = [ YaST::YCP::Integer(1024), + YaST::YCP::Integer(5) ]; $dbDefaults{'defaultIndex'} = YaST::YCP::Boolean(1); $dbDefaults{'serviceEnabled'} = YaST::YCP::Boolean(0); @@ -608,16 +652,26 @@ 'rootdn' => $dbDefaults{'rootdn'}, 'rootpw' => $pwHash, 'directory' => '/var/lib/ldap', - 'entrycache' => $dbDefaults{'entrycache'}, - 'idlcache' => $dbDefaults{'idlcache'} }; + 'entrycache' => YaST::YCP::Integer($dbDefaults{'entrycache'}), + 'idlcache' => YaST::YCP::Integer($dbDefaults{'idlcache'}), + 'checkpoint' => $dbDefaults{'checkpoint'} }; my $cfgdatabase = { 'type' => 'config', 'rootdn' => 'cn=config' }; + my $frontenddb = { 'type' => 'frontend', + 'access' => [ + 'to dn.base="" by * read', + 'to dn.base="cn=Subschema" by * read', + 'to attrs=userPassword,userPKCS12 by self write by * auth', + # 'to attrs=shadowLastChange by self write by * read', + 'to * by * read' + ] + }; @schema = ( "core", "cosine", "inetorgperson" ); SCR->Execute('.ldapserver.initGlobals' ); SCR->Execute('.ldapserver.initSchema', \@schema ); - SCR->Execute('.ldapserver.initDatabases', [ $cfgdatabase, $database ] ); + SCR->Execute('.ldapserver.initDatabases', [ $frontenddb, $cfgdatabase, $database ] ); my $rc = SCR->Read('.ldapserver.databases'); if ( $dbDefaults{'defaultIndex'} == 1 ) { Modified: trunk/ldap-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/complex.ycp (original) +++ trunk/ldap-server/src/complex.ycp Fri Jun 27 16:00:40 2008 @@ -404,6 +404,16 @@ // LdapServer::AbortFunction = PollAbort; boolean ret = LdapServer::Write(); if (! ret ) { + map<string,string> err = LdapServer::GetError(); + if (err["details"]:"" != "" ) + { + Popup::ErrorDetails( err["msg"]:"", err["details"]:"" ); + } + else + { + Popup::Error( err["msg"]:"unknown" ); + } + return `abort; } // ret = LdapServer::WritePPolicyObjects(); -- 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] r48649 - /trunk/ldap-server/src/agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:36 2008 New Revision: 48649 URL: http://svn.opensuse.org/viewcvs/yast?rev=48649&view=rev Log: reworked ".initDatabases" code to share code between different backend types Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 16:00:36 2008 @@ -195,63 +195,71 @@ YCPMap dbMap = dbList->value(i)->asMap(); std::string dbtype(dbMap->value(YCPString("type"))->asString()->value_cstr()); y2milestone("Database Type: %s", dbtype.c_str()); + boost::shared_ptr<OlcDatabase> db; if ( dbtype == "bdb" ) { - boost::shared_ptr<OlcBdbDatabase> db(new OlcBdbDatabase() ); - db->setIndex(i); - YCPMapIterator j = dbMap.begin(); - for ( ; j != dbMap.end(); j++ ) + db = boost::shared_ptr<OlcDatabase>(new OlcBdbDatabase() ); + } + else + { + db = boost::shared_ptr<OlcDatabase>( new OlcDatabase(dbtype.c_str()) ); + } + db->setIndex(i-1); + YCPMapIterator j = dbMap.begin(); + for ( ; j != dbMap.end(); j++ ) + { + y2milestone("Key: %s, Valuetype: %s", + j.key()->asString()->value_cstr(), + j.value()->valuetype_str() ); + if ( std::string("suffix") == j.key()->asString()->value_cstr() ) { - if ( std::string("suffix") == j.key()->asString()->value_cstr() ) - { - db->setSuffix( j.value()->asString()->value_cstr() ); - } - else if (std::string("rootdn") == j.key()->asString()->value_cstr() ) - { - db->setRootDn( j.value()->asString()->value_cstr() ); - } - else if (std::string("rootpw") == j.key()->asString()->value_cstr() ) + db->setSuffix( j.value()->asString()->value_cstr() ); + continue; + } + else if (std::string("rootdn") == j.key()->asString()->value_cstr() ) + { + db->setRootDn( j.value()->asString()->value_cstr() ); + continue; + } + else if (std::string("rootpw") == j.key()->asString()->value_cstr() ) + { + db->setRootPw( j.value()->asString()->value_cstr() ); + continue; + } + else if (std::string("access") == j.key()->asString()->value_cstr() ) + { + YCPList aclList = j.value()->asList(); + for ( int k=0 ; k < aclList.size(); k++ ) { - db->setRootPw( j.value()->asString()->value_cstr() ); + db->addStringValue( "olcAccess", aclList.value(k)->asString()->value_cstr() ); } - else if (std::string("directory") == j.key()->asString()->value_cstr() ) + continue; + } + if ( dbtype == "bdb" ) + { + boost::shared_ptr<OlcBdbDatabase> bdb = + boost::dynamic_pointer_cast<OlcBdbDatabase>(db); + if (std::string("directory") == j.key()->asString()->value_cstr() ) { - db->setDirectory( j.value()->asString()->value_cstr() ); + bdb->setDirectory( j.value()->asString()->value_cstr() ); } else if (std::string("entrycache") == j.key()->asString()->value_cstr() ) { - db->setStringValue( "olcDbCachesize", j.value()->asString()->value_cstr() ); + bdb->setEntryCache( j.value()->asInteger()->value() ); } else if (std::string("idlcache") == j.key()->asString()->value_cstr() ) { - db->setStringValue( "olcDbIdlCachesize", j.value()->asString()->value_cstr() ); - } - } - databases.push_back(db); - } - else - { - y2error("Database Type \"%s\" not supported. Trying to use generic Database class", dbtype.c_str()); - boost::shared_ptr<OlcDatabase> db(new OlcDatabase(dbtype.c_str()) ); - db->setIndex(i); - YCPMapIterator j = dbMap.begin(); - for ( ; j != dbMap.end(); j++ ) - { - if ( std::string("suffix") == j.key()->asString()->value_cstr() ) - { - db->setSuffix( j.value()->asString()->value_cstr() ); - } - else if (std::string("rootdn") == j.key()->asString()->value_cstr() ) - { - db->setRootDn( j.value()->asString()->value_cstr() ); + bdb->setIdlCache( j.value()->asInteger()->value() ); } - else if (std::string("rootpw") == j.key()->asString()->value_cstr() ) + else if (std::string("checkpoint") == j.key()->asString()->value_cstr() ) { - db->setRootPw( j.value()->asString()->value_cstr() ); + YCPList cpList = j.value()->asList(); + bdb->setCheckPoint( cpList->value(0)->asInteger()->value(), + cpList->value(1)->asInteger()->value() ); } } - databases.push_back(db); } + databases.push_back(db); } } else if ( path->component_str(0) == "commitChanges" ) @@ -829,7 +837,7 @@ ppolicyOlc = *j; } YCPMap argMap = arg->asMap(); - y2milestone("Mapsize: %d", argMap.size()); + y2milestone("Mapsize: %ld", argMap.size()); if ( argMap.size() == 0 ){ y2milestone("Delete ppolicy overlay"); ppolicyOlc->clearChangedEntry(); -- 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] r48648 - in /trunk/ldap-server/src/lib: slapd-config.cpp slapd-config.h
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:33 2008 New Revision: 48648 URL: http://svn.opensuse.org/viewcvs/yast?rev=48648&view=rev Log: Helper methods for caching and checkpoint settings Modified: trunk/ldap-server/src/lib/slapd-config.cpp trunk/ldap-server/src/lib/slapd-config.h Modified: trunk/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Fri Jun 27 16:00:33 2008 @@ -221,6 +221,39 @@ this->setStringValue("olcDbDirectory", dir); } +int OlcBdbDatabase::getEntryCache() const +{ + return this->getIntValue( "olcDbCachesize" ); +} + +void OlcBdbDatabase::setEntryCache( int cachesize ) +{ + this->setIntValue( "olcDbCachesize", cachesize ); +} + +int OlcBdbDatabase::getIdlCache() const +{ + return this->getIntValue( "olcDbIdlCachesize" ); +} + +void OlcBdbDatabase::setIdlCache( int cachesize ) +{ + this->setIntValue( "olcDbIdlCachesize", cachesize ); +} + +void OlcBdbDatabase::setCheckPoint( int kbytes, int min ) +{ + std::ostringstream oStr; + oStr << kbytes << " " << min; + this->setStringValue( "olcDbCheckpoint", oStr.str() ); +} + +//int[] OlcBdbDatabase::getCheckPoint() +//{ +// int[2] ret = { 0,0 }; +// return ret; +//} + OlcGlobalConfig::OlcGlobalConfig() : OlcConfigEntry() { m_dbEntryChanged.setDN("cn=config"); @@ -748,6 +781,26 @@ } } +int OlcConfigEntry::getIntValue( const std::string &type ) const +{ + StringList sl = this->getStringValues(type); + if ( sl.size() == 1 ) { + std::istringstream iStr(*sl.begin()); + int value; + iStr >> value; + return value; + } else { + throw(std::runtime_error("Attribute is not single-valued") ); + } +} + +void OlcConfigEntry::setIntValue( const std::string &type, int value ) +{ + std::ostringstream oStr; + oStr << value; + this->setStringValue( type, oStr.str() ); +} + std::string OlcConfigEntry::toLdif() const { std::ostringstream ldifStream; Modified: trunk/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.h (original) +++ trunk/ldap-server/src/lib/slapd-config.h Fri Jun 27 16:00:33 2008 @@ -47,6 +47,9 @@ void setStringValue(const std::string &type, const std::string &value); void addStringValue(const std::string &type, const std::string &value); + int getIntValue( const std::string &type ) const; + void setIntValue( const std::string &type, int value ); + void setIndex( int index ); int getEntryIndex() const; @@ -135,6 +138,15 @@ virtual std::vector<IndexType> getDatabaseIndex( const std::string &attr ) const; virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx); virtual void deleteIndex(const std::string& attr); + + int getEntryCache() const; + void setEntryCache( int cachesize ); + + int getIdlCache() const; + void setIdlCache( int cachesize ); + + void setCheckPoint( int kbytes, int min ); + //int[] getCheckPoint() const; }; class OlcTlsSettings; -- 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] r48647 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc wizards.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:28 2008 New Revision: 48647 URL: http://svn.opensuse.org/viewcvs/yast?rev=48647&view=rev Log: Set sane defaults for caches and indexing in Proposal Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/wizards.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 16:00:28 2008 @@ -36,6 +36,50 @@ my $registerSlp = 0; my $useLdapiForConfig = 0; my %dbDefaults = (); +my @defaultIndexes = ( + { "name" => "objectclass", + "eq" => YaST::YCP::Boolean(1) + }, + { "name" => "uidNumber", + "eq" => YaST::YCP::Boolean(1) + }, + { "name" => "gidNumber", + "eq" => YaST::YCP::Boolean(1) + }, + { "name" => "member", + "eq" => YaST::YCP::Boolean(1), + "pres" => YaST::YCP::Boolean(1) + }, + { "name" => "mail", + "eq" => YaST::YCP::Boolean(1), + "pres" => YaST::YCP::Boolean(1) + }, + { "name" => "cn", + "eq" => YaST::YCP::Boolean(1), + "pres" => YaST::YCP::Boolean(1), + "sub" => YaST::YCP::Boolean(1) + }, + { "name" => "displayName", + "eq" => YaST::YCP::Boolean(1), + "pres" => YaST::YCP::Boolean(1), + "sub" => YaST::YCP::Boolean(1) + }, + { "name" => "uid", + "eq" => YaST::YCP::Boolean(1), + "pres" => YaST::YCP::Boolean(1), + "sub" => YaST::YCP::Boolean(1) + }, + { "name" => "sn", + "eq" => YaST::YCP::Boolean(1), + "pres" => YaST::YCP::Boolean(1), + "sub" => YaST::YCP::Boolean(1) + }, + { "name" => "givenName", + "eq" => YaST::YCP::Boolean(1), + "pres" => YaST::YCP::Boolean(1), + "sub" => YaST::YCP::Boolean(1) + } + ); my @databases = (); my @schema = (); @@ -545,6 +589,10 @@ $dbDefaults{'rootpw'} = ""; $dbDefaults{'rootpw_clear'} = ""; $dbDefaults{'pwenctype'} = "SSHA"; + $dbDefaults{'entrycache'} = 10000; + $dbDefaults{'idlcache'} = 10000; + + $dbDefaults{'defaultIndex'} = YaST::YCP::Boolean(1); $dbDefaults{'serviceEnabled'} = YaST::YCP::Boolean(0); $dbDefaults{'slpRegister'} = YaST::YCP::Boolean(0); return 1; @@ -559,11 +607,11 @@ 'suffix' => $dbDefaults{'basedn'}, 'rootdn' => $dbDefaults{'rootdn'}, 'rootpw' => $pwHash, - 'directory' => '/var/lib/ldap' - }; + 'directory' => '/var/lib/ldap', + 'entrycache' => $dbDefaults{'entrycache'}, + 'idlcache' => $dbDefaults{'idlcache'} }; my $cfgdatabase = { 'type' => 'config', - 'rootdn' => 'cn=config' - }; + 'rootdn' => 'cn=config' }; @schema = ( "core", "cosine", "inetorgperson" ); @@ -571,6 +619,13 @@ SCR->Execute('.ldapserver.initSchema', \@schema ); SCR->Execute('.ldapserver.initDatabases', [ $cfgdatabase, $database ] ); my $rc = SCR->Read('.ldapserver.databases'); + if ( $dbDefaults{'defaultIndex'} == 1 ) + { + foreach my $idx ( @defaultIndexes ) + { + $self->ChangeDatabaseIndex(1, $idx ); + } + } y2milestone("Databases: ". Data::Dumper->Dump([$rc])); @databases = @{$rc}; return 1; Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 16:00:28 2008 @@ -218,6 +218,14 @@ { db->setDirectory( j.value()->asString()->value_cstr() ); } + else if (std::string("entrycache") == j.key()->asString()->value_cstr() ) + { + db->setStringValue( "olcDbCachesize", j.value()->asString()->value_cstr() ); + } + else if (std::string("idlcache") == j.key()->asString()->value_cstr() ) + { + db->setStringValue( "olcDbIdlCachesize", j.value()->asString()->value_cstr() ); + } } databases.push_back(db); } Modified: trunk/ldap-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/wizards.ycp (original) +++ trunk/ldap-server/src/wizards.ycp Fri Jun 27 16:00:28 2008 @@ -70,8 +70,7 @@ "database" : $[ `next : "summary", `back : `back, - `abort : `back, - `cancel : `back + `abort : `abort, ], "summary" : $[ `next : "write", -- 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] r48646 - in /trunk/ldap-server/src: LdapServer.pm dialogs.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:24 2008 New Revision: 48646 URL: http://svn.opensuse.org/viewcvs/yast?rev=48646&view=rev Log: Set rootpw upon database creation Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/dialogs.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 16:00:24 2008 @@ -542,6 +542,8 @@ y2milestone("basedn: $basedn"); $dbDefaults{'basedn'} = $basedn; $dbDefaults{'rootdn'} = "cn=admin,".$basedn; + $dbDefaults{'rootpw'} = ""; + $dbDefaults{'rootpw_clear'} = ""; $dbDefaults{'pwenctype'} = "SSHA"; $dbDefaults{'serviceEnabled'} = YaST::YCP::Boolean(0); $dbDefaults{'slpRegister'} = YaST::YCP::Boolean(0); @@ -551,23 +553,26 @@ BEGIN { $TYPEINFO {ReadFromDefaults} = ["function", "boolean"]; } sub ReadFromDefaults { + my $self = shift; + my $pwHash = $self->HashPassword($dbDefaults{'pwenctype'}, $dbDefaults{'rootpw_clear'} ); my $database = { 'type' => 'bdb', 'suffix' => $dbDefaults{'basedn'}, 'rootdn' => $dbDefaults{'rootdn'}, + 'rootpw' => $pwHash, 'directory' => '/var/lib/ldap' }; my $cfgdatabase = { 'type' => 'config', - 'rootdn' => 'cn=config', - 'rootpw' => 'secret' + 'rootdn' => 'cn=config' }; @schema = ( "core", "cosine", "inetorgperson" ); - push @databases, ( $cfgdatabase, $database ); - SCR->Execute('.ldapserver.initGlobals' ); SCR->Execute('.ldapserver.initSchema', \@schema ); - SCR->Execute('.ldapserver.initDatabases', \@databases ); + SCR->Execute('.ldapserver.initDatabases', [ $cfgdatabase, $database ] ); + my $rc = SCR->Read('.ldapserver.databases'); + y2milestone("Databases: ". Data::Dumper->Dump([$rc])); + @databases = @{$rc}; return 1; } @@ -727,7 +732,14 @@ return $rc; } - +## + # Get all ldap-server settings from the first parameter + # (For use by autoinstallation.) + # @param hashalgorithm a string defining the hashing algorithm (can be one of + # "CRYPT", "SMD5", "SHA", "SSHA" and "PLAIN" + # @param cleartext the cleartext password + # @return The hashed password value (Format: {hashmethod}hashedpassword ) + # BEGIN { $TYPEINFO {HashPassword} = ["function", "string", "string", "string" ] ; } sub HashPassword { Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Fri Jun 27 16:00:24 2008 @@ -329,26 +329,26 @@ else if( ret == `next ) { //validate/update rootpw - defaults["rootpw"] = (string)UI::QueryWidget( `id( `te_rootpw ), `Value ); - if ( defaults["rootpw"]:"" == "" ) + defaults["rootpw_clear"] = (string)UI::QueryWidget( `id( `te_rootpw ), `Value ); + if ( defaults["rootpw_clear"]:"" == "" ) { Popup::Error( _("Please enter a password for the Administrator user") ); continue; } - if( defaults["rootpw"]:"" != "" ) + if( defaults["rootpw_clear"]:"" != "" ) { - if( defaults["rootpw"]:"" != UI::QueryWidget( `id( `te_valid_rootpw ), `Value ) ) + if( defaults["rootpw_clear"]:"" != UI::QueryWidget( `id( `te_valid_rootpw ), `Value ) ) { /* error popup */ Popup::Error( _("Password validation failed.") ); - defaults["rootpw"] = ""; + defaults["rootpw_clear"] = ""; continue; } } //update enctype string enctype = (string)UI::QueryWidget( `id( `cmb_cryptmethod ), `Value ); y2debug( "changing enctype to %1", enctype ); -// LdapServerConf::enctype = enctype; + defaults["pwenctype"] = enctype; //update Base DN defaults["basedn"] = (string)UI::QueryWidget( `id( `te_basedn ), `Value ); -- 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] r48645 - /trunk/ldap-server/src/agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:20 2008 New Revision: 48645 URL: http://svn.opensuse.org/viewcvs/yast?rev=48645&view=rev Log: Don't crash on missing keys in the db-Maps Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 16:00:20 2008 @@ -199,10 +199,26 @@ { boost::shared_ptr<OlcBdbDatabase> db(new OlcBdbDatabase() ); db->setIndex(i); - db->setSuffix(dbMap->value(YCPString("suffix"))->asString()->value_cstr()); - db->setRootDn(dbMap->value(YCPString("rootdn"))->asString()->value_cstr()); - db->setDirectory(dbMap->value(YCPString("directory"))->asString()->value_cstr()); -// db->setRootPw(dbMap->value(YCPString("rootpw"))->asString()->toString()); + YCPMapIterator j = dbMap.begin(); + for ( ; j != dbMap.end(); j++ ) + { + if ( std::string("suffix") == j.key()->asString()->value_cstr() ) + { + db->setSuffix( j.value()->asString()->value_cstr() ); + } + else if (std::string("rootdn") == j.key()->asString()->value_cstr() ) + { + db->setRootDn( j.value()->asString()->value_cstr() ); + } + else if (std::string("rootpw") == j.key()->asString()->value_cstr() ) + { + db->setRootPw( j.value()->asString()->value_cstr() ); + } + else if (std::string("directory") == j.key()->asString()->value_cstr() ) + { + db->setDirectory( j.value()->asString()->value_cstr() ); + } + } databases.push_back(db); } else @@ -210,9 +226,22 @@ y2error("Database Type \"%s\" not supported. Trying to use generic Database class", dbtype.c_str()); boost::shared_ptr<OlcDatabase> db(new OlcDatabase(dbtype.c_str()) ); db->setIndex(i); -// db->setSuffix(dbMap->value(YCPString("suffix"))->asString()->value_cstr()); - db->setRootDn(dbMap->value(YCPString("rootdn"))->asString()->value_cstr()); - db->setRootPw(dbMap->value(YCPString("rootpw"))->asString()->value_cstr()); + YCPMapIterator j = dbMap.begin(); + for ( ; j != dbMap.end(); j++ ) + { + if ( std::string("suffix") == j.key()->asString()->value_cstr() ) + { + db->setSuffix( j.value()->asString()->value_cstr() ); + } + else if (std::string("rootdn") == j.key()->asString()->value_cstr() ) + { + db->setRootDn( j.value()->asString()->value_cstr() ); + } + else if (std::string("rootpw") == j.key()->asString()->value_cstr() ) + { + db->setRootPw( j.value()->asString()->value_cstr() ); + } + } databases.push_back(db); } } -- 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] r48644 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc complex.ycp wizards.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:17 2008 New Revision: 48644 URL: http://svn.opensuse.org/viewcvs/yast?rev=48644&view=rev Log: Reworked migration wizard (slapd.conf -> back-config) Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/complex.ycp trunk/ldap-server/src/wizards.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 16:00:17 2008 @@ -34,6 +34,7 @@ my $slapdConfChanged = 0; my $serviceEnabled = 0; my $registerSlp = 0; +my $useLdapiForConfig = 0; my %dbDefaults = (); my @databases = (); @@ -304,6 +305,15 @@ y2milestone(); return 0; } + +BEGIN { $TYPEINFO {UseLdapiForConfig} = ["function", "boolean", "boolean"]; } +sub UseLdapiForConfig +{ + my $self = shift; + $useLdapiForConfig = shift; + return 1; +} + BEGIN { $TYPEINFO {ReadServiceEnabled} = ["function", "boolean"]; } sub ReadServiceEnabled { y2milestone("ReadServiceEnabled $serviceEnabled"); @@ -347,7 +357,6 @@ { my $self = shift; my ( $msg, $details ) = @_; - y2milestone("Error: $msg, $details"); $error{'msg'} = $msg; $error{'details'} = $details; } @@ -424,8 +433,10 @@ my $self = shift; my $progressItems = [ _("Cleaning up directory for config database"), _("Converting slapd.conf to config database"), - _("Switching startup configuration to use config database")]; + _("Switching startup configuration to use config database"), + _("Restarting LDAP Server") ]; Progress->New("Migrating LDAP Server Configuration", "Blub", 3, $progressItems, $progressItems, ""); + Progress->NextStage(); Progress->NextStage(); @@ -448,6 +459,37 @@ Progress->Finish(); return 0; } + if ( $useLdapiForConfig ) + { + $rc = SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPI', 'yes'); + if ( ! $rc ) + { + y2error("Error while enabling LDAPI listener"); + $self->SetError( _("Enabling LDAPI listener failed.") ); + Progress->Finish(); + return 0; + } + $rc = SCR->Execute('.ldapserver.addRootSaslRegexp'); + if ( ! $rc ) + { + y2error("Error while creating SASL Auth mapping for \"root\"."); + $self->SetError( _("Enabling LDAPI listener failed.") ); + Progress->Finish(); + return 0; + } + } + # FIXME: + # Explicit cache flush, see bnc#350581 for details + SCR->Write(".sysconfig.openldap", undef); + Progress->NextStage(); + $rc = Service->Restart("ldap"); + if (! $rc ) + { + y2error("Error while starting the LDAP service"); + $self->SetError( _("Starting the LDAP service failed.") ); + Progress->Finish(); + return 0; + } Progress->Finish(); return 1; } Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 16:00:17 2008 @@ -240,6 +240,35 @@ } } } + else if ( path->component_str(0) == "addRootSaslRegexp" ) + { + std::string filename = "/etc/openldap/slapd.d/cn=config.ldif"; + std::ifstream ldifFile(filename.c_str()); + try { + LdifReader ldif(ldifFile); + if ( ldif.readNextRecord() ) + { + LDAPEntry entry, oldEntry; + entry = ldif.getEntryRecord(); + entry.addAttribute( + LDAPAttribute( "olcAuthzRegexp", + "gidNumber=0\\+uidNumber=0,cn=peercred,cn=external,cn=auth dn:cn=config") + ); + ldifFile.close(); + std::ofstream oldifFile(filename.c_str(), std::ios::out|std::ios::trunc); + LdifWriter oldif(oldifFile); + oldif.writeRecord(entry); + oldifFile.close(); + } + return YCPBoolean(true); + } catch ( std::runtime_error e ) { + lastError->add(YCPString("summary"), + YCPString("Error while parsing LDIF file") ); + lastError->add(YCPString("description"), + YCPString(std::string( e.what() ) ) ); + return YCPBoolean(false); + } + } return YCPBoolean(true); } Modified: trunk/ldap-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/complex.ycp (original) +++ trunk/ldap-server/src/complex.ycp Fri Jun 27 16:00:17 2008 @@ -162,6 +162,88 @@ string configFile = "/etc/openldap/slapd.conf"; if ( !hasBackconfig && configModified ) { + return `migrate; + + } + else if (! configModified ) + { + // Start new config wizward + LdapServer::InitDbDefaults(); + return `initial; + } + + return `next; +} + +symbol MigrationMainDialog() +{ + string caption = "Migrate existing Configuration"; + string summary = _("Your system is currently configured to use the configuration +file /etc/openldap/slapd.conf. This YaST module does only support the dynamich +configuration database of OpenLDAP (back-config). Do you want to migrate your +existing configuration to the configuration database?"); + term contents = + `VBox( + `HSquash( + `RadioButtonGroup( + `id( `rb ), + `VBox( + `Label( summary ), + `Left( + `RadioButton( `id( 0 ), _("Migrate existing configuration"), true ) + ), + `Left( + `RadioButton( `id( 1 ), _("Create a new configuration from scratch") ) + ) + ) + ) + ) + ); + + Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"", + Label::BackButton(), Label::NextButton()); + symbol ret = `next; + while(true) { + ret = (symbol)UI::UserInput(); + + /* abort? */ + if (ret == `abort || ret == `cancel ) + { + if(ReallyAbort()) + { + break; + } + else + { + continue; + } + } + else if ( ret == `next ) + { + integer current = (integer) UI::QueryWidget(`id(`rb), `CurrentButton); + if ( current == 0 ) + { + ret = `next; + } + else + { + ret = `initial; + } + break; + } + else if ( ret == `back ) + { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + return ret; + +/* switchToBackConfig = Popup::ContinueCancelHeadline( _("Convert to \"Back-Config\"?"), _("Your system is currently configured to use the configuration file /etc/openldap/slapd.conf. This YaST @@ -193,17 +275,126 @@ { return `abort; } +*/ +} + +symbol MigrationDialog() +{ + string caption = "Migrate existing Configuration"; + string summary = _("In order to access the server configration after the migration you need +to configure how YaST should authenticate against the configuration database."); + list enc_types = [ + `item( `id( "CRYPT" ), "CRYPT" ), + `item( `id( "SMD5" ), "SMD5" ), + `item( `id( "SHA" ), "SHA" ), + `item( `id( "SSHA" ), "SSHA", true ), + `item( `id( "PLAIN" ), "PLAIN" ) + ]; + term contents = + `VBox( + `HSquash( + `RadioButtonGroup( `id( `rb ), + `VBox( + `Label( summary ), + `Left( + `RadioButton( `id( `rb_ldapi ), `opt(`notify), + _("Access the Server via LDAP over Unix Domain Sockets (ldapi) +and give \"root\" full access to the configuration."), true ) + ), + `Left( + `RadioButton( `id( `rb_passwd ), `opt(`notify), + _("Use a \"normal\" encrypted LDAP connection with LDAP +simple authentication.") ) + ), + `Left( + `Label( `id( `lab_pw ), _("Please set a password of the configuration user (cn=config)") ) + ), + `Password( `id( `te_rootpw ), _("New &Password") ), + `HSpacing( 0.5 ), + `Password( `id( `te_valid_rootpw ), _("&Validate Password") ), + `HSpacing( 0.5 ), + `ComboBox( `id( `cb_cryptmethod ), _("Password &Encryption"), enc_types ) + ) + ) + ) + ); + + Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"", + Label::BackButton(), Label::NextButton()); + + UI::ChangeWidget( `lab_pw , `Enabled, false ); + UI::ChangeWidget( `te_rootpw , `Enabled, false ); + UI::ChangeWidget( `te_valid_rootpw , `Enabled, false ); + UI::ChangeWidget( `cb_cryptmethod , `Enabled, false ); + symbol ret = `next; + while(true) { + ret = (symbol)UI::UserInput(); + + /* abort? */ + if (ret == `abort || ret == `cancel ) + { + if(ReallyAbort()) + { + break; + } + else + { + continue; + } + } + else if ( ret == `next ) + { + symbol current = (symbol) UI::QueryWidget(`id(`rb), `CurrentButton); + if ( current == `rb_ldapi ) + { + LdapServer::UseLdapiForConfig( true ); + ret = `next; + } + else + { + ret = `initial; + } + break; + } + else if ( ret == `back ) + { + break; + } + else if ( ret == `rb_ldapi ) + { + UI::ChangeWidget( `lab_pw , `Enabled, false ); + UI::ChangeWidget( `te_rootpw , `Enabled, false ); + UI::ChangeWidget( `te_valid_rootpw , `Enabled, false ); + UI::ChangeWidget( `cb_cryptmethod , `Enabled, false ); + } + else if ( ret == `rb_passwd ) + { + UI::ChangeWidget( `lab_pw , `Enabled, true ); + UI::ChangeWidget( `te_rootpw , `Enabled, true ); + UI::ChangeWidget( `te_valid_rootpw , `Enabled, true ); + UI::ChangeWidget( `cb_cryptmethod , `Enabled, true ); + } + else + { + y2error("unexpected retcode: %1", ret); + continue; + } } - else if (! configModified ) + + return ret; +} + +symbol DoMigration() +{ + if (! LdapServer::MigrateSlapdConf()) { - // Start new config wizward - LdapServer::InitDbDefaults(); - return `initial; + y2milestone("LdapServer::MigrateSlapdConf failed"); + DisplayError( LdapServer::GetError() ); + return `abort; } - + LdapServer::Read(); return `next; } - /** * Write settings dialog * @return `abort if aborted and `next otherwise @@ -234,7 +425,7 @@ term contents = `VBox( `RichText( summary ), - `Right( + `Right( `PushButton( `id(`pb_advanced), _("Advanced Configuration") ) ) ); Modified: trunk/ldap-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/wizards.ycp (original) +++ trunk/ldap-server/src/wizards.ycp Fri Jun 27 16:00:17 2008 @@ -101,6 +101,51 @@ return ret; } +any MigrateSequence() { + + /* Initialization dialog caption */ + string caption = _("LDAP Server Configuration"); + /* Initialization dialog contents */ + term contents = `Label(_("Initializing...")); + + + map aliases = $[ + "startup" : ``( MigrationMainDialog() ), + "proposal" : ``( ProposalSequence() ), + "authconfig" : ``( MigrationDialog() ), + "migrate" : ``( DoMigration() ) + ]; + + map sequence = $[ + "ws_start" : "startup", + "startup" : $[ + `abort : `abort, + `next : "authconfig", + `initial : "proposal" + ], + "authconfig" : $[ + `next : "migrate" + ], + "migrate" : $[ + `next : `next + ], + "proposal" : $[ + `next : `next + ] + ]; + + y2milestone( "--> starting MigrateSequence" ); + + Wizard::CreateDialog(); + any ret = Sequencer::Run(aliases, sequence); + + y2milestone( "--> MigrateSequence finished " ); + + UI::CloseDialog(); + + return ret; +} + /** * Whole configuration of ldap-server * @return sequence result @@ -109,6 +154,7 @@ map aliases = $[ "read" : ``( ReadDialog() ), + "migrate" : ``( MigrateSequence() ), "propose" : ``( ProposalSequence() ), "main" : ``( MainSequence() ), "write" : ``( WriteDialog() ) @@ -119,8 +165,14 @@ "read" : $[ `abort : `abort, `initial : "propose", + `migrate : "migrate", `next : "main" ], + "migrate" : $[ + `abort : `abort, + `initial : "propose", + `next : "main" + ], "propose" : $[ `next : `next, `abort : `abort -- 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] r48643 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.h lib/Makefile.am lib/backConfigTest.cpp lib/backConfigTest.h lib/slapd-config.cpp lib/slapd-config.h
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:13 2008 New Revision: 48643 URL: http://svn.opensuse.org/viewcvs/yast?rev=48643&view=rev Log: Rename backConfigTest -> slapd-config Added: trunk/ldap-server/src/lib/slapd-config.cpp - copied, changed from r48642, trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/slapd-config.h - copied, changed from r48642, trunk/ldap-server/src/lib/backConfigTest.h Removed: trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.h trunk/ldap-server/src/lib/Makefile.am Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.h (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.h Fri Jun 27 16:00:13 2008 @@ -11,7 +11,7 @@ #include <Y2.h> #include <scr/SCRAgent.h> #include <boost/shared_ptr.hpp> -#include "backConfigTest.h" +#include "slapd-config.h" /** * @short An interface class between YaST2 and Ldap Agent */ Modified: trunk/ldap-server/src/lib/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/Makefile.am?… ============================================================================== --- trunk/ldap-server/src/lib/Makefile.am (original) +++ trunk/ldap-server/src/lib/Makefile.am Fri Jun 27 16:00:13 2008 @@ -1,8 +1,8 @@ lib_LTLIBRARIES = libslapdconfig.la -libslapdconfig_la_SOURCES = backConfigTest.cpp +libslapdconfig_la_SOURCES = slapd-config.cpp -include_HEADERS = backConfigTest.h +include_HEADERS = slapd-config.h libslapdconfig_la_LIBADD = -lldapcpp libslapdconfig_la_LDFLAGS = -version-info 0:1:0 Copied: trunk/ldap-server/src/lib/slapd-config.cpp (from r48642, trunk/ldap-server/src/lib/backConfigTest.cpp) URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Fri Jun 27 16:00:13 2008 @@ -7,7 +7,7 @@ #include <vector> #include <LDAPEntry.h> #include <LdifWriter.h> -#include "backConfigTest.h" +#include "slapd-config.h" static bool nocase_compare( char c1, char c2){ return toupper(c1) == toupper(c2); Copied: trunk/ldap-server/src/lib/slapd-config.h (from r48642, trunk/ldap-server/src/lib/backConfigTest.h) URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== (empty) -- 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] r48642 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.cc lib/backConfigTest.cpp lib/backConfigTest.h
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:08 2008 New Revision: 48642 URL: http://svn.opensuse.org/viewcvs/yast?rev=48642&view=rev Log: fixed creation of new password overlays Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 16:00:08 2008 @@ -222,6 +222,11 @@ if ( globals ) olc.updateEntry( *globals ); + OlcSchemaList::const_iterator j; + for ( j = schema.begin(); j != schema.end() ; j++ ) + { + olc.updateEntry(**j); + } OlcDatabaseList::const_iterator i; for ( i = databases.begin(); i != databases.end() ; i++ ) { @@ -230,14 +235,10 @@ OlcOverlayList::const_iterator k; for ( k = overlays.begin(); k != overlays.end(); k++ ) { + y2milestone("Update overlay: %s", (*k)->getDn().c_str() ); olc.updateEntry(**k); } } - OlcSchemaList::const_iterator j; - for ( j = schema.begin(); j != schema.end() ; j++ ) - { - olc.updateEntry(**j); - } } return YCPBoolean(true); } @@ -745,34 +746,47 @@ { if ( (*j)->getType() == "ppolicy" ) { - YCPMap argMap = arg->asMap(); - y2milestone("Mapsize: %d", argMap.size()); - if ( argMap.size() == 0 ){ - y2milestone("Delete ppolicy overlay"); - (*j)->clearChangedEntry(); - } else { - (*j)->setStringValue("olcPpolicyDefault", - argMap->value(YCPString("defaultPolicy"))->asString()->value_cstr() ); - if ( argMap->value(YCPString("useLockout"))->asBoolean()->value() == true ) - { - (*j)->setStringValue("olcPpolicyUseLockout", "TRUE"); - } - else - { - (*j)->setStringValue("olcPpolicyUseLockout", "FALSE"); - } - if ( argMap->value(YCPString("hashClearText"))->asBoolean()->value() == true ) - { - (*j)->setStringValue("olcPpolicyHashCleartext", "TRUE"); - } - else - { - (*j)->setStringValue("olcPpolicyHashCleartext", "FALSE"); - } - } break; } } + boost::shared_ptr<OlcOverlay> ppolicyOlc; + if ( j == overlays.end() ) + { + y2milestone("New Overlay added"); + boost::shared_ptr<OlcOverlay> tmp(new OlcOverlay("ppolicy", (*i)->getDn())); + ppolicyOlc = tmp; + (*i)->addOverlay(ppolicyOlc); + } + else + { + y2milestone("Update existing Overlay"); + ppolicyOlc = *j; + } + YCPMap argMap = arg->asMap(); + y2milestone("Mapsize: %d", argMap.size()); + if ( argMap.size() == 0 ){ + y2milestone("Delete ppolicy overlay"); + ppolicyOlc->clearChangedEntry(); + } else { + ppolicyOlc->setStringValue("olcPpolicyDefault", + argMap->value(YCPString("defaultPolicy"))->asString()->value_cstr() ); + if ( argMap->value(YCPString("useLockout"))->asBoolean()->value() == true ) + { + ppolicyOlc->setStringValue("olcPpolicyUseLockout", "TRUE"); + } + else + { + ppolicyOlc->setStringValue("olcPpolicyUseLockout", "FALSE"); + } + if ( argMap->value(YCPString("hashClearText"))->asBoolean()->value() == true ) + { + ppolicyOlc->setStringValue("olcPpolicyHashCleartext", "TRUE"); + } + else + { + ppolicyOlc->setStringValue("olcPpolicyHashCleartext", "FALSE"); + } + } ret = true; } else Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 16:00:08 2008 @@ -567,6 +567,16 @@ entryIndex = splitIndexFromString( type, m_type ); } +OlcOverlay::OlcOverlay( const std::string &type, const std::string &parent ) + : m_type(type) +{ + std::ostringstream dnstr; + dnstr << "olcOverlay=" << m_type << "," << parent; + m_dbEntryChanged.setDN(dnstr.str()); + m_dbEntryChanged.addAttribute(LDAPAttribute("objectclass", "olcPpolicyConfig")); + m_dbEntryChanged.addAttribute(LDAPAttribute("olcoverlay", m_type)); +} + const std::string OlcOverlay::getType() const { return m_type; Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 16:00:08 2008 @@ -82,6 +82,7 @@ public: static OlcOverlay* createFromLdapEntry( const LDAPEntry& le); OlcOverlay( const LDAPEntry &le ); + OlcOverlay( const std::string &type, const std::string &parent ); const std::string getType() const; protected: -- 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] r48641 - /trunk/ldap-server/agents/ag_ldapserver
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:04 2008 New Revision: 48641 URL: http://svn.opensuse.org/viewcvs/yast?rev=48641&view=rev Log: remove old perl-based ldapserver-agent Removed: trunk/ldap-server/agents/ag_ldapserver -- 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] r48640 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc lib/backConfigTest.cpp lib/backConfigTest.h tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:00:01 2008 New Revision: 48640 URL: http://svn.opensuse.org/viewcvs/yast?rev=48640&view=rev Log: - brought back ppolicy support - some cleanup Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 16:00:01 2008 @@ -582,10 +582,44 @@ return $rc; } -BEGIN { $TYPEINFO {AddPasswordPolicy} = ["function", "boolean" , "integer", ["map", "string", "string" ] ]; } +BEGIN { $TYPEINFO {GetOverlayList} = ["function", [ "list", [ "map" , "string", "string"] ], "integer" ]; } +sub GetOverlayList +{ + my ($self, $index) = @_; + y2milestone("GetOverlayList ", $index); + my $rc = SCR->Read(".ldapserver.database.{".$index."}.overlays" ); + y2milestone( "Overlays: ".Data::Dumper->Dump([$rc]) ); + return $rc; +} + +BEGIN { $TYPEINFO {GetPpolicyOverlay} = ["function", [ "map" , "string", "any" ], "integer" ]; } +sub GetPpolicyOverlay +{ + my ($self, $index) = @_; + y2milestone("GetPpolicyOverlay ", $index); + my $rc = SCR->Read(".ldapserver.database.{".$index."}.ppolicy" ); + y2milestone( "Ppolicy: ".Data::Dumper->Dump([$rc]) ); + if ( defined $rc->{'hashClearText'} ) + { + $rc->{'hashClearText'} = YaST::YCP::Boolean($rc->{'hashClearText'}); + } + if ( defined $rc->{'useLockout'} ) + { + $rc->{'useLockout'} = YaST::YCP::Boolean($rc->{'useLockout'}); + } + return $rc; +} + +BEGIN { $TYPEINFO {AddPasswordPolicy} = ["function", "boolean" , "integer", ["map", "string", "any" ] ]; } sub AddPasswordPolicy { my ($self, $dbIndex, $ppolicy ) = @_; + y2milestone("AddPasswordPolicy: ".Data::Dumper->Dump([$ppolicy])." ". scalar(keys %{$ppolicy}) ); + if ( 0 < scalar(keys %{$ppolicy}) ) + { + $ppolicy->{'hashClearText'} = YaST::YCP::Boolean($ppolicy->{'hashClearText'}); + $ppolicy->{'useLockout'} = YaST::YCP::Boolean($ppolicy->{'useLockout'}); + } if ( ! SCR->Write(".ldapserver.database.{".$dbIndex."}.ppolicy", $ppolicy ) ) { my $err = SCR->Error(".ldapserver"); $self->SetError( $err->{'summary'}, $err->{'description'} ); Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 16:00:01 2008 @@ -226,6 +226,12 @@ for ( i = databases.begin(); i != databases.end() ; i++ ) { olc.updateEntry(**i); + OlcOverlayList overlays = (*i)->getOverlays(); + OlcOverlayList::const_iterator k; + for ( k = overlays.begin(); k != overlays.end(); k++ ) + { + olc.updateEntry(**k); + } } OlcSchemaList::const_iterator j; for ( j = schema.begin(); j != schema.end() ; j++ ) @@ -391,26 +397,84 @@ } else { std::string dbComponent = path->component_str(1); y2milestone("Component %s ", dbComponent.c_str()); - IndexMap idx = (*i)->getDatabaseIndexes(); - IndexMap::const_iterator j = idx.begin(); - for ( ; j != idx.end(); j++ ) - { - YCPMap ycpIdx; - y2milestone("indexed Attribute: \"%s\"", j->first.c_str() ); - std::vector<IndexType>::const_iterator k = j->second.begin(); - for ( ; k != j->second.end(); k++ ) + if ( dbComponent == "indexes" ) + { + IndexMap idx = (*i)->getDatabaseIndexes(); + IndexMap::const_iterator j = idx.begin(); + for ( ; j != idx.end(); j++ ) { - if ( *k == Eq ){ - ycpIdx.add(YCPString("eq"), YCPBoolean(true) ); - } else if ( *k == Present ){ - ycpIdx.add(YCPString("pres"), YCPBoolean(true) ); - } else if ( *k == Sub ){ - ycpIdx.add(YCPString("sub"), YCPBoolean(true) ); + YCPMap ycpIdx; + y2milestone("indexed Attribute: \"%s\"", j->first.c_str() ); + std::vector<IndexType>::const_iterator k = j->second.begin(); + for ( ; k != j->second.end(); k++ ) + { + if ( *k == Eq ){ + ycpIdx.add(YCPString("eq"), YCPBoolean(true) ); + } else if ( *k == Present ){ + ycpIdx.add(YCPString("pres"), YCPBoolean(true) ); + } else if ( *k == Sub ){ + ycpIdx.add(YCPString("sub"), YCPBoolean(true) ); + } } + resMap.add( YCPString(j->first), ycpIdx ); } - resMap.add( YCPString(j->first), ycpIdx ); + return resMap; + } + else if ( dbComponent == "overlays" ) + { + OlcOverlayList overlays = (*i)->getOverlays(); + OlcOverlayList::const_iterator j = overlays.begin(); + YCPList resList; + for (; j != overlays.end(); j++ ) + { + y2milestone("Overlay: %s", (*j)->getType().c_str() ); + YCPMap overlayMap; + overlayMap.add( YCPString("type"), YCPString( (*j)->getType() ) ); + overlayMap.add( YCPString("index"), YCPInteger( (*j)->getEntryIndex() ) ); + resList.add(overlayMap); + } + return resList; + } + else if ( dbComponent == "ppolicy" ) + { + OlcOverlayList overlays = (*i)->getOverlays(); + OlcOverlayList::const_iterator j = overlays.begin(); + YCPList resList; + for (; j != overlays.end(); j++ ) + { + if ( (*j)->getType() == "ppolicy" ) + { + resMap.add(YCPString("defaultPolicy"), + YCPString((*j)->getStringValue("olcPpolicyDefault") ) ); + if ( (*j)->getStringValue("olcPPolicyHashCleartext") == "TRUE" ) + { + resMap.add(YCPString("hashClearText"), YCPBoolean(true) ); + } + else + { + resMap.add(YCPString("hashClearText"), YCPBoolean(false) ); + } + if ( (*j)->getStringValue("olcPPolicyUseLockout") == "TRUE" ) + { + resMap.add(YCPString("useLockout"), YCPBoolean(true) ); + } + else + { + resMap.add(YCPString("useLockout"), YCPBoolean(false) ); + } + break; + } + } + return resMap; + } + else + { + lastError->add(YCPString("summary"), YCPString("Read Failed") ); + std::string msg = "Unsupported SCR path: `.ldapserver.database."; + msg += path->toString().c_str(); + msg += "`"; + lastError->add(YCPString("description"), YCPString(msg) ); } - return resMap; } } } @@ -672,7 +736,47 @@ (*i)->addIndex(attr, idx); } ret = true; - } else { + } + else if (dbComponent == "ppolicy" ) + { + OlcOverlayList overlays = (*i)->getOverlays(); + OlcOverlayList::const_iterator j = overlays.begin(); + for (; j != overlays.end(); j++ ) + { + if ( (*j)->getType() == "ppolicy" ) + { + YCPMap argMap = arg->asMap(); + y2milestone("Mapsize: %d", argMap.size()); + if ( argMap.size() == 0 ){ + y2milestone("Delete ppolicy overlay"); + (*j)->clearChangedEntry(); + } else { + (*j)->setStringValue("olcPpolicyDefault", + argMap->value(YCPString("defaultPolicy"))->asString()->value_cstr() ); + if ( argMap->value(YCPString("useLockout"))->asBoolean()->value() == true ) + { + (*j)->setStringValue("olcPpolicyUseLockout", "TRUE"); + } + else + { + (*j)->setStringValue("olcPpolicyUseLockout", "FALSE"); + } + if ( argMap->value(YCPString("hashClearText"))->asBoolean()->value() == true ) + { + (*j)->setStringValue("olcPpolicyHashCleartext", "TRUE"); + } + else + { + (*j)->setStringValue("olcPpolicyHashCleartext", "FALSE"); + } + } + break; + } + } + ret = true; + } + else + { lastError->add(YCPString("summary"), YCPString("Write Failed") ); std::string msg = "Unsupported SCR path: `.ldapserver.database."; msg += path->toString().c_str(); @@ -772,7 +876,7 @@ y2milestone("Comment or empty" ); continue; } - int pos=schemaLine.find_last_not_of(" \t\n"); + std::string::size_type pos=schemaLine.find_last_not_of(" \t\n"); if (pos != std::string::npos ) schemaLine.erase(pos+1, std::string::npos ); Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 16:00:01 2008 @@ -13,6 +13,22 @@ return toupper(c1) == toupper(c2); } +static int splitIndexFromString(const std::string &in, std::string &out) +{ + int index=0; + if ( in[0] == '{' ) + { + std::string::size_type pos = in.find('}'); + std::istringstream indexstr(in.substr(1, pos-1)); + indexstr >> index; + out = in.substr( pos+1, std::string::npos ); + } else { + out = in; + index = 0; + } + return index; +} + static bool strCaseIgnoreEquals(const std::string &s1, const std::string &s2) { if(s1.size() == s2.size()){ @@ -27,16 +43,7 @@ OlcDatabase::OlcDatabase( const LDAPEntry& le=LDAPEntry()) : OlcConfigEntry(le) { std::string type(this->getStringValue("olcdatabase")); - if ( type[0] == '{' ) - { - std::string::size_type pos = type.find('}'); - std::istringstream indexstr(type.substr(1, pos-1)); - indexstr >> entryIndex; - m_type = type.substr( pos+1, std::string::npos ); - } else { - m_type = type; - entryIndex = 0; - } + entryIndex = splitIndexFromString( type, m_type ); } OlcDatabase::OlcDatabase( const std::string& type ) : m_type(type) @@ -364,16 +371,7 @@ { std::cout << "OlcSchemaConfig::OlcSchemaConfig(const LDAPEntry &e) : OlcConfigEntry(e)" << std::endl; std::string name(this->getStringValue("cn")); - if ( name[0] == '{' ) - { - std::string::size_type pos = name.find('}'); - std::istringstream indexstr(name.substr(1, pos-1)); - indexstr >> entryIndex; - m_name = name.substr( pos+1, std::string::npos ); - } else { - m_name = name; - entryIndex = 0; - } + entryIndex = splitIndexFromString( name, m_name ); } void OlcSchemaConfig::clearChangedEntry() @@ -395,13 +393,9 @@ for ( j = types.begin(); j != types.end(); j++ ) { LDAPAttrType currentAttr; - if ( (*j)[0] == '{' ) - { - std::string::size_type pos = j->find('}'); - currentAttr = LDAPAttrType( j->substr( pos+1, std::string::npos ) ); - } else { - currentAttr = LDAPAttrType( *j ); - } + std::string tmp; + splitIndexFromString( *j, tmp ); + currentAttr = LDAPAttrType( tmp ); res.push_back(currentAttr); } return res; @@ -418,35 +412,35 @@ tls.applySettings( *this ); } -std::map<std::string, std::list<std::string> > OlcGlobalConfig::toMap() const -{ - std::map<std::string, std::list<std::string> > resMap; - const LDAPAttribute *at = m_dbEntryChanged.getAttributeByName("olcsuffix"); - if ( at ) - { - StringList values = at->getValues(); - StringList::const_iterator j; - std::list<std::string> valList; - for ( j = values.begin(); j != values.end(); j++ ) - { - valList.push_back(*j); - } - resMap.insert(std::make_pair("suffix", valList)); - } - at = m_dbEntryChanged.getAttributeByName("olcDatabase"); - if ( at ) - { - StringList values = at->getValues(); - StringList::const_iterator j; - std::list<std::string> valList; - for ( j = values.begin(); j != values.end(); j++ ) - { - valList.push_back(*j); - } - resMap.insert(std::make_pair("type", valList)); - } - return resMap; -} +//std::map<std::string, std::list<std::string> > OlcGlobalConfig::toMap() const +//{ +// std::map<std::string, std::list<std::string> > resMap; +// const LDAPAttribute *at = m_dbEntryChanged.getAttributeByName("olcsuffix"); +// if ( at ) +// { +// StringList values = at->getValues(); +// StringList::const_iterator j; +// std::list<std::string> valList; +// for ( j = values.begin(); j != values.end(); j++ ) +// { +// valList.push_back(*j); +// } +// resMap.insert(std::make_pair("suffix", valList)); +// } +// at = m_dbEntryChanged.getAttributeByName("olcDatabase"); +// if ( at ) +// { +// StringList values = at->getValues(); +// StringList::const_iterator j; +// std::list<std::string> valList; +// for ( j = values.begin(); j != values.end(); j++ ) +// { +// valList.push_back(*j); +// } +// resMap.insert(std::make_pair("type", valList)); +// } +// return resMap; +//} bool OlcConfigEntry::isDatabaseEntry ( const LDAPEntry& e ) { @@ -529,17 +523,17 @@ } } -std::map<std::string, std::list<std::string> > OlcConfigEntry::toMap() const -{ - std::map<std::string, std::list<std::string> > resMap; -// std::string value = this->getStringValue("olcConcurrency"); -// resMap.insert( std::make_pair( "concurrency", value ) ); +//std::map<std::string, std::list<std::string> > OlcConfigEntry::toMap() const +//{ +// std::map<std::string, std::list<std::string> > resMap; +//// std::string value = this->getStringValue("olcConcurrency"); +//// resMap.insert( std::make_pair( "concurrency", value ) ); +//// +//// value = this->getStringValue("olcThreads"); +//// resMap.insert( std::make_pair("threads", value ) ); // -// value = this->getStringValue("olcThreads"); -// resMap.insert( std::make_pair("threads", value ) ); - - return resMap; -} +// return resMap; +//} void OlcConfigEntry::setIndex( int index ) { @@ -561,37 +555,54 @@ m_dbEntryChanged = LDAPEntry(); } +OlcOverlay* OlcOverlay::createFromLdapEntry( const LDAPEntry& e) +{ + return new OlcOverlay(e); +} -std::map<std::string, std::list<std::string> > OlcDatabase::toMap() const +OlcOverlay::OlcOverlay( const LDAPEntry& e) : OlcConfigEntry(e) { - std::map<std::string, std::list<std::string> > resMap; - const LDAPAttribute *at = m_dbEntryChanged.getAttributeByName("olcsuffix"); - if ( at ) - { - StringList values = at->getValues(); - StringList::const_iterator j; - std::list<std::string> valList; - for ( j = values.begin(); j != values.end(); j++ ) - { - valList.push_back(*j); - } - resMap.insert(std::make_pair("suffix", valList)); - } - at = m_dbEntryChanged.getAttributeByName("olcDatabase"); - if ( at ) - { - StringList values = at->getValues(); - StringList::const_iterator j; - std::list<std::string> valList; - for ( j = values.begin(); j != values.end(); j++ ) - { - valList.push_back(*j); - } - resMap.insert(std::make_pair("type", valList)); - } - return resMap; + std::cerr << "OlcOverlay::OlcOverlay()" << std::endl; + std::string type(this->getStringValue("olcoverlay")); + entryIndex = splitIndexFromString( type, m_type ); +} + +const std::string OlcOverlay::getType() const +{ + return m_type; } + +//std::map<std::string, std::list<std::string> > OlcDatabase::toMap() const +//{ +// std::map<std::string, std::list<std::string> > resMap; +// const LDAPAttribute *at = m_dbEntryChanged.getAttributeByName("olcsuffix"); +// if ( at ) +// { +// StringList values = at->getValues(); +// StringList::const_iterator j; +// std::list<std::string> valList; +// for ( j = values.begin(); j != values.end(); j++ ) +// { +// valList.push_back(*j); +// } +// resMap.insert(std::make_pair("suffix", valList)); +// } +// at = m_dbEntryChanged.getAttributeByName("olcDatabase"); +// if ( at ) +// { +// StringList values = at->getValues(); +// StringList::const_iterator j; +// std::list<std::string> valList; +// for ( j = values.begin(); j != values.end(); j++ ) +// { +// valList.push_back(*j); +// } +// resMap.insert(std::make_pair("type", valList)); +// } +// return resMap; +//} + void OlcDatabase::setSuffix( const std::string &suffix) { this->setStringValue("olcSuffix", suffix); @@ -617,26 +628,36 @@ return this->m_type; } -std::map<std::string, std::list<std::string> > OlcBdbDatabase::toMap() const +void OlcDatabase::addOverlay(boost::shared_ptr<OlcOverlay> overlay) { - std::map<std::string, std::list<std::string> > resMap = - OlcDatabase::toMap(); + m_overlays.push_back(overlay); +} - const LDAPAttribute *at = m_dbEntryChanged.getAttributeByName("olcDbNoSync"); - if ( at ) - { - StringList values = at->getValues(); - StringList::const_iterator j; - std::list<std::string> valList; - for ( j = values.begin(); j != values.end(); j++ ) - { - valList.push_back(*j); - } - resMap.insert(std::make_pair("nosync", valList)); - } - return resMap; +OlcOverlayList& OlcDatabase::getOverlays() +{ + return m_overlays; } +//std::map<std::string, std::list<std::string> > OlcBdbDatabase::toMap() const +//{ +// std::map<std::string, std::list<std::string> > resMap = +// OlcDatabase::toMap(); +// +// const LDAPAttribute *at = m_dbEntryChanged.getAttributeByName("olcDbNoSync"); +// if ( at ) +// { +// StringList values = at->getValues(); +// StringList::const_iterator j; +// std::list<std::string> valList; +// for ( j = values.begin(); j != values.end(); j++ ) +// { +// valList.push_back(*j); +// } +// resMap.insert(std::make_pair("nosync", valList)); +// } +// return resMap; +//} + bool OlcDatabase::isBdbDatabase( const LDAPEntry& e ) { StringList oc = e.getAttributeByName("objectclass")->getValues(); @@ -692,8 +713,16 @@ void OlcConfigEntry::setStringValue(const std::string &type, const std::string &value) { - LDAPAttribute attr(type, value); - m_dbEntryChanged.replaceAttribute(attr); + std::cerr << "setStringValue() " << type << " " << value << std::endl; + if ( value.empty() ) + { + m_dbEntryChanged.delAttribute(type); + } + else + { + LDAPAttribute attr(type, value); + m_dbEntryChanged.replaceAttribute(attr); + } } void OlcConfigEntry::addStringValue(const std::string &type, const std::string &value) @@ -886,10 +915,20 @@ LDAPSearchResults *sr = m_lc->search( "cn=config", LDAPConnection::SEARCH_ONE, "objectclass=olcDatabaseConfig" ); LDAPEntry *dbEntry; - while ( dbEntry = sr->getNext() ) + while ( (dbEntry = sr->getNext()) != 0 ) { - std::cout << "Got Database Entry: " << dbEntry->getDN() << std::endl; + std::string dbDn(dbEntry->getDN()); + std::cout << "Got Database Entry: " << dbDn << std::endl; boost::shared_ptr<OlcDatabase> olce(OlcDatabase::createFromLdapEntry(*dbEntry)); + LDAPSearchResults *overlaySearchRes = m_lc->search( dbDn, + LDAPConnection::SEARCH_ONE, "objectclass=olcOverlayConfig" ); + LDAPEntry *overlayEntry; + while ( (overlayEntry = overlaySearchRes->getNext()) != 0 ) + { + std::cout << "Got Overlay: " << overlayEntry->getDN() << std::endl; + boost::shared_ptr<OlcOverlay> overlay(OlcOverlay::createFromLdapEntry(*overlayEntry) ); + olce->addOverlay(overlay); + } res.push_back(olce); } } catch (LDAPException e ) { Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 16:00:01 2008 @@ -48,11 +48,10 @@ void addStringValue(const std::string &type, const std::string &value); void setIndex( int index ); - void getEntryDn(); int getEntryIndex() const; - virtual std::map<std::string, std::list<std::string> > toMap() const; +// virtual std::map<std::string, std::list<std::string> > toMap() const; virtual std::string toLdif() const; protected: @@ -78,6 +77,18 @@ typedef std::map<std::string, std::vector<IndexType> > IndexMap; +class OlcOverlay : public OlcConfigEntry +{ + public: + static OlcOverlay* createFromLdapEntry( const LDAPEntry& le); + OlcOverlay( const LDAPEntry &le ); + const std::string getType() const; + + protected: + std::string m_type; +}; + +typedef std::list<boost::shared_ptr<OlcOverlay> > OlcOverlayList; class OlcDatabase : public OlcConfigEntry { public : @@ -95,15 +106,19 @@ const std::string getSuffix() const; const std::string getType() const; - virtual std::map<std::string, std::list<std::string> > toMap() const; + //virtual std::map<std::string, std::list<std::string> > toMap() const; virtual IndexMap getDatabaseIndexes() const {}; virtual std::vector<IndexType> getDatabaseIndex( const std::string &attr ) const {}; virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx) {}; virtual void deleteIndex(const std::string& attr) {}; - + + void addOverlay(boost::shared_ptr<OlcOverlay> overlay); + OlcOverlayList& getOverlays() ; + protected: virtual void updateEntryDn(); std::string m_type; + OlcOverlayList m_overlays; }; @@ -112,7 +127,7 @@ public: OlcBdbDatabase(); OlcBdbDatabase( const LDAPEntry& le ); - virtual std::map<std::string, std::list<std::string> > toMap() const; + //virtual std::map<std::string, std::list<std::string> > toMap() const; void setDirectory( const std::string &dir); virtual IndexMap getDatabaseIndexes() const; @@ -140,7 +155,7 @@ OlcTlsSettings getTlsSettings() const; void setTlsSettings( const OlcTlsSettings& tls); - virtual std::map<std::string, std::list<std::string> > toMap() const; + //virtual std::map<std::string, std::list<std::string> > toMap() const; }; class OlcSchemaConfig : public OlcConfigEntry @@ -191,6 +206,7 @@ typedef std::list<boost::shared_ptr<OlcDatabase> > OlcDatabaseList; typedef std::list<boost::shared_ptr<OlcSchemaConfig> > OlcSchemaList; + class OlcConfig { public: Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 16:00:01 2008 @@ -995,19 +995,21 @@ define boolean cb_read_ppolicy() { y2milestone("cb_read_ppolicy()"); + integer index = (integer)widget_map[current_tree_item,"index"]:nil; // Check for ppolicy overlay - //map<string,string> ppolicy_map = LdapServer::GetPasswordPolicyOverlay(suffix); - string suffix = ""; - map<string,string> ppolicy_map = nil; - if ( ppolicy_map != nil ){ + map<string,any> ppolicy_map = LdapServer::GetPpolicyOverlay(index); + if ( size(ppolicy_map) != 0 ){ UI::ChangeWidget( `cb_ppolicy_overlay, `Value, true ); - string pp_hash_cleartext = ppolicy_map["ppolicy_hash_cleartext"]:nil; - string pp_use_lockout = ppolicy_map["ppolicy_use_lockout"]:nil; - string pp_default = ppolicy_map["ppolicy_default"]:nil; + boolean pp_hash_cleartext = (boolean)ppolicy_map["hashClearText"]:nil; + boolean pp_use_lockout = (boolean)ppolicy_map["useLockout"]:nil; + string pp_default = (string)ppolicy_map["defaultPolicy"]:nil; boolean pp_append_checked = false; + map<string,string> olddb = LdapServer::GetDatabase(index); + string suffix = olddb["suffix"]:""; integer pos = search( pp_default, suffix ); if( pos > -1 ) { + string chkSuffix = substring( pp_default, pos ); if ( chkSuffix == suffix ) { @@ -1015,17 +1017,17 @@ pp_append_checked = true; } } - if ( pp_hash_cleartext != nil ){ + if ( pp_hash_cleartext ){ UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Value, true ); } else { UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Value, false ); } - if ( pp_use_lockout != nil ){ + if ( pp_use_lockout ){ UI::ChangeWidget( `cb_ppolicy_uselockout, `Value, true ); } else { UI::ChangeWidget( `cb_ppolicy_uselockout, `Value, false ); } - if ( pp_default != nil ){ + if ( pp_default != "" ){ UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Value, pp_default ); UI::ChangeWidget( `cb_pp_append_basedn, `Value, pp_append_checked ); } else { @@ -1051,13 +1053,22 @@ boolean hashcleartext = (boolean)UI::QueryWidget( `cb_ppolicy_hashcleartext, `Value ); boolean uselockout = (boolean)UI::QueryWidget( `cb_ppolicy_uselockout, `Value ); string pp_default = (string)UI::QueryWidget( `te_ppolicy_defaultpolicy, `Value ); -// map<string,string> ppolicy_old = LdapServer::GetPasswordPolicyOverlay(suffix); - map<string,string> ppolicy = $[]; - if (hashcleartext ) { - ppolicy = add( ppolicy, "ppolicy_hash_cleartext", ""); + map<string,any> ppolicy = $[]; + if (hashcleartext ) + { + ppolicy = add( ppolicy, "hashClearText", true); + } + else + { + ppolicy = add( ppolicy, "hashClearText", false); + } + if (uselockout) + { + ppolicy = add( ppolicy, "useLockout", true); } - if (uselockout) { - ppolicy = add( ppolicy, "ppolicy_use_lockout", ""); + else + { + ppolicy = add( ppolicy, "useLockout", false); } if (pp_default != "" ) { if( (boolean)UI::QueryWidget( `cb_pp_append_basedn, `Value ) ) @@ -1066,10 +1077,11 @@ string suffix = db["suffix"]:""; pp_default = pp_default+","+suffix; } -// if (pp_default != ppolicy_old["ppolicy_default"]:nil ) { -// db = add(db, "ppolicy_default_changed", "1"); -// } - ppolicy = add( ppolicy, "ppolicy_default", pp_default); + ppolicy = add( ppolicy, "defaultPolicy", pp_default); + } + else + { + ppolicy = add( ppolicy, "defaultPolicy", ""); } y2milestone("Policy: %1", ppolicy); result = LdapServer::AddPasswordPolicy( index, ppolicy ); @@ -1086,6 +1098,13 @@ // LdapServer::WriteSchemaIncludeList(inclist); // } } else { + // delete ppolicy + result = LdapServer::AddPasswordPolicy( index, $[] ); + if ( ! result ) { + map<string, string> err = LdapServer::GetError(); + callback_error = err["msg"]:"" + "\n" + err["details"]:""; + } + // map<string,string> ppolicy_map = LdapServer::GetPasswordPolicyOverlay(suffix); // if ( ppolicy_map != nil ){ // list<any> newoverlay = []; -- 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] r48639 - /trunk/ldap-server/src/agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:56 2008 New Revision: 48639 URL: http://svn.opensuse.org/viewcvs/yast?rev=48639&view=rev Log: use case insensitive matching on schema config objects Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:59:56 2008 @@ -41,6 +41,11 @@ } +bool caseIgnoreCompare( char c1, char c2) +{ + return toupper(c1) == toupper(c2); +} + SlapdConfigAgent::SlapdConfigAgent() { y2milestone("SlapdConfigAgent::SlapdConfigAgent"); @@ -772,20 +777,27 @@ schemaLine.erase(pos+1, std::string::npos ); // FIXME: should validate Schema syntax here - if ( ! schemaLine.compare(0, sizeof("objectidentifier")-1, "objectidentifier" ) ) + std::string oid("objectidentifier"); + std::string at("attributetype"); + std::string oc("objectclasses"); + if ( equal(schemaLine.begin(), schemaLine.begin()+sizeof("objectidentifier")-1, + oid.begin(), caseIgnoreCompare ) ) { pos = schemaLine.find_first_not_of(" \t", sizeof("objectidentifier") ); schemaLine.erase(0, pos ); y2milestone("objectIdentifier Line <%s>", schemaLine.c_str() ); entry.addAttribute(LDAPAttribute("olcObjectIdentifier", schemaLine) ); } - else if ( ! schemaLine.compare(0, sizeof("attributetype")-1, "attributetype" ) ) + else if ( equal(schemaLine.begin(), schemaLine.begin()+sizeof("attributetype")-1, + at.begin(), caseIgnoreCompare ) ) { int pos = schemaLine.find_first_not_of(" \t", sizeof("attributetype") ); schemaLine.erase(0, pos ); entry.addAttribute(LDAPAttribute("olcAttributeTypes", schemaLine) ); } - else if ( ! schemaLine.compare(0, sizeof("objectClass")-1, "objectClass" ) ) + + else if ( equal(schemaLine.begin(), schemaLine.begin()+sizeof("objectclass")-1, + oc.begin(), caseIgnoreCompare ) ) { int pos = schemaLine.find_first_not_of(" \t", sizeof("objectClass") ); schemaLine.erase(0, pos ); -- 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] r48638 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:52 2008 New Revision: 48638 URL: http://svn.opensuse.org/viewcvs/yast?rev=48638&view=rev Log: support for adding Schema from old .schema Files (instead of LDIF-only) Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 15:59:52 2008 @@ -605,6 +605,19 @@ return $rc; } +BEGIN { $TYPEINFO {AddSchemaToSchemaList} = ["function", "boolean", "string" ]; } +sub AddSchemaToSchemaList +{ + my ($self, $file) = @_; + + my $rc = SCR->Write(".ldapserver.schema.addFromSchemafile", $file); + if ( ! $rc ) { + my $err = SCR->Error(".ldapserver"); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + } + return $rc; +} + BEGIN { $TYPEINFO {AddLdifToSchemaList} = ["function", "boolean", "string" ]; } sub AddLdifToSchemaList { Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:59:52 2008 @@ -682,6 +682,25 @@ return YCPBoolean(ret); } +int getSchemaLine( std::istream &input, std::string &schemaLine) +{ + if ( ! getline(input, schemaLine) ) + { + return -1; + } + while ( input && + (input.peek() == ' ' || input.peek() == '\t')) + { + std::string cat; + if (input.peek() == '\t' ) + schemaLine += ' '; + input.ignore(); + getline(input, cat); + schemaLine += cat; + } + return 0; +} + YCPBoolean SlapdConfigAgent::WriteSchema( const YCPPath &path, const YCPValue &arg, const YCPValue &arg2) @@ -712,8 +731,82 @@ YCPString(std::string( e.what() ) ) ); return YCPBoolean(false); } + } + else if ( subpath == "addFromSchemafile" ) + { + std::string filename = arg->asString()->value_cstr(); + y2milestone("reading Schema from File: %s", filename.c_str()); + // build RDN for new schema entry + std::string::size_type pos = filename.find_last_of('/'); + std::string rdn = filename.substr(pos+1); + // does file name end with .schema? + if ( rdn.size() >= 7 ) + { + if ( rdn.substr( rdn.size()-7 ) == ".schema" ) + { + rdn = rdn.substr(0, rdn.size()-7 ); + } + } + std::string dn = "cn="; + dn += rdn; + dn += ",cn=schema,cn=config"; + y2milestone("RDN will be: %s", dn.c_str()); + + std::ifstream input(filename.c_str()); + std::string schemaLine; + LDAPEntry entry(dn), oldEntry; + entry.addAttribute( LDAPAttribute( "objectClass", "olcSchemaConfig" ) ); + entry.addAttribute( LDAPAttribute( "cn", rdn ) ); + + while ( ! getSchemaLine(input, schemaLine) ) + { + y2milestone("Read schema Line: %s", schemaLine.c_str() ); + // empty or comment? + if ( schemaLine[0] == '#' || schemaLine.size() == 0 ) + { + y2milestone("Comment or empty" ); + continue; + } + int pos=schemaLine.find_last_not_of(" \t\n"); + if (pos != std::string::npos ) + schemaLine.erase(pos+1, std::string::npos ); + + // FIXME: should validate Schema syntax here + if ( ! schemaLine.compare(0, sizeof("objectidentifier")-1, "objectidentifier" ) ) + { + pos = schemaLine.find_first_not_of(" \t", sizeof("objectidentifier") ); + schemaLine.erase(0, pos ); + y2milestone("objectIdentifier Line <%s>", schemaLine.c_str() ); + entry.addAttribute(LDAPAttribute("olcObjectIdentifier", schemaLine) ); + } + else if ( ! schemaLine.compare(0, sizeof("attributetype")-1, "attributetype" ) ) + { + int pos = schemaLine.find_first_not_of(" \t", sizeof("attributetype") ); + schemaLine.erase(0, pos ); + entry.addAttribute(LDAPAttribute("olcAttributeTypes", schemaLine) ); + } + else if ( ! schemaLine.compare(0, sizeof("objectClass")-1, "objectClass" ) ) + { + int pos = schemaLine.find_first_not_of(" \t", sizeof("objectClass") ); + schemaLine.erase(0, pos ); + entry.addAttribute(LDAPAttribute("olcObjectClasses", schemaLine) ); + } + else + { + lastError->add(YCPString("summary"), + YCPString("Error while parsing Schema file") ); + lastError->add(YCPString("description"), YCPString("") ); + return YCPBoolean(false); + } + } + schema.push_back( boost::shared_ptr<OlcSchemaConfig>(new OlcSchemaConfig(oldEntry, entry)) ); + + //lastError->add( YCPString("summary"), + // YCPString("Error while parsing Schema file") ); + //lastError->add( YCPString("description"), YCPString("") ); + return YCPBoolean(true); } - if ( subpath == "remove" ) + else if ( subpath == "remove" ) { std::string name = arg->asString()->value_cstr(); y2milestone("remove Schema Entry: %s", name.c_str()); Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:59:52 2008 @@ -86,7 +86,6 @@ ``{ y2milestone( "calling schema read handler" ); list<string> inclist = LdapServer::GetSchemaList(); -// //store current include list for later order changes update_schemalist( inclist ); return true; } @@ -134,8 +133,13 @@ } if ( regexpmatch( new_item, ".*\.schema$" ) ) { - callback_error = _(".schema Files not supported yet"); - return false; + if (! LdapServer::AddSchemaToSchemaList(new_item) ) { + map<string, string> err = LdapServer::GetError(); + callback_error = err["msg"]:"" + "\n" + err["details"]:""; + return false; + } + list<string> inclist = LdapServer::GetSchemaList(); + update_schemalist( inclist ); } else if (! LdapServer::AddLdifToSchemaList(new_item) ) { -- 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] r48637 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:48 2008 New Revision: 48637 URL: http://svn.opensuse.org/viewcvs/yast?rev=48637&view=rev Log: removed lintremoved lintremoved lintremoved lintremoved lintremoved lintremoved lint Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:59:48 2008 @@ -91,22 +91,6 @@ return true; } -define boolean cb_check_schema() -``{ - y2milestone( "calling schema check handler" ); - //dummy check strings - /* error popup */ - string invalid_schema = sformat( _("The file '%1' is not a schema file."), "dummy" ); - return true; -} - -define boolean cb_write_schema() -``{ - y2milestone( "calling schema write handler" ); -// LdapServer::WriteSchemaIncludeList( (list<string>)widget_map["g_schema","inclist"]:[] ); - return true; -} - integer find_pos( list<string> l, string s ) { y2debug( "-------------- starting find_pos ----------------" ); @@ -1138,9 +1122,7 @@ "name" : _("Schema Files"), "widget" : schemaWidget, "inclist" : [], - "cb_check" : ``( cb_check_schema() ), "cb_read" : ``( cb_read_schema() ), - "cb_write" : ``( cb_write_schema() ), "cb_input" : ``( cb_input_schema() ) ], "g_loglevel" : $[ -- 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] r48636 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:45 2008 New Revision: 48636 URL: http://svn.opensuse.org/viewcvs/yast?rev=48636&view=rev Log: Some error handling for Schemas Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 15:59:45 2008 @@ -347,6 +347,7 @@ { my $self = shift; my ( $msg, $details ) = @_; + y2milestone("Error: $msg, $details"); $error{'msg'} = $msg; $error{'details'} = $details; } @@ -610,7 +611,10 @@ my ($self, $file) = @_; my $rc = SCR->Write(".ldapserver.schema.addFromLdif", $file); - + if ( ! $rc ) { + my $err = SCR->Error(".ldapserver"); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + } return $rc; } Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:59:45 2008 @@ -5,6 +5,7 @@ #include <LdifWriter.h> #include <LDAPEntry.h> #include <SaslInteraction.h> +#include <exception> #include <sstream> #include <fstream> @@ -695,14 +696,22 @@ std::string filename = arg->asString()->value_cstr(); y2milestone("adding Ldif File: %s", filename.c_str()); std::ifstream ldifFile(filename.c_str()); - LdifReader ldif(ldifFile); - if ( ldif.readNextRecord() ) - { - LDAPEntry entry, oldEntry; - entry = ldif.getEntryRecord(); - schema.push_back( boost::shared_ptr<OlcSchemaConfig>(new OlcSchemaConfig(oldEntry, entry)) ); + try { + LdifReader ldif(ldifFile); + if ( ldif.readNextRecord() ) + { + LDAPEntry entry, oldEntry; + entry = ldif.getEntryRecord(); + schema.push_back( boost::shared_ptr<OlcSchemaConfig>(new OlcSchemaConfig(oldEntry, entry)) ); + } + return YCPBoolean(true); + } catch ( std::runtime_error e ) { + lastError->add(YCPString("summary"), + YCPString("Error while parsing LDIF file") ); + lastError->add(YCPString("description"), + YCPString(std::string( e.what() ) ) ); + return YCPBoolean(false); } - return YCPBoolean(true); } if ( subpath == "remove" ) { Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:59:45 2008 @@ -74,16 +74,12 @@ ** global schema handlers *****************************/ -void update_schemalist( list<string> l, string select_item ) +void update_schemalist( list<string> l ) { if( l == nil ) l = []; //widget_map["g_schema","inclist"] = l; UI::ChangeWidget( `sb_schemalist, `Items, l ); UI::ChangeWidget( `pb_delete, `Enabled, false ); - if( select_item != nil ) - { - UI::ChangeWidget( `sb_schemalist, `CurrentItem, select_item ); - } } define boolean cb_read_schema() @@ -91,7 +87,7 @@ y2milestone( "calling schema read handler" ); list<string> inclist = LdapServer::GetSchemaList(); // //store current include list for later order changes - update_schemalist( inclist, nil ); + update_schemalist( inclist ); return true; } @@ -152,17 +148,27 @@ callback_error = _("The schema file is already in the list."); return false; } - - LdapServer::AddLdifToSchemaList(new_item); - list<string> inclist = LdapServer::GetSchemaList(); - update_schemalist( inclist, new_item ); + if ( regexpmatch( new_item, ".*\.schema$" ) ) + { + callback_error = _(".schema Files not supported yet"); + return false; + } + else if (! LdapServer::AddLdifToSchemaList(new_item) ) + { + map<string, string> err = LdapServer::GetError(); + callback_error = err["msg"]:"" + "\n" + err["details"]:""; + return false; + } else { + list<string> inclist = LdapServer::GetSchemaList(); + update_schemalist( inclist ); + } } else if( handler_cmd == `pb_delete ) { if( current_item == nil ) return true; LdapServer::RemoveFromSchemaList(current_item); list<string> inclist = LdapServer::GetSchemaList(); - update_schemalist( inclist, nil ); + update_schemalist( inclist ); } return true; } -- 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] r48635 - in /trunk/ldap-server/src: LdapServer.pm tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:40 2008 New Revision: 48635 URL: http://svn.opensuse.org/viewcvs/yast?rev=48635&view=rev Log: - UI cleanup - error handling - more work on Password Policies Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 15:59:40 2008 @@ -578,8 +578,21 @@ $newIdx->{'eq'} = YaST::YCP::Boolean($newIdx->{'eq'}); $newIdx->{'sub'} = YaST::YCP::Boolean($newIdx->{'sub'}); my $rc = SCR->Write(".ldapserver.database.{".$dbIndex."}.index", $newIdx ); + return $rc; } +BEGIN { $TYPEINFO {AddPasswordPolicy} = ["function", "boolean" , "integer", ["map", "string", "string" ] ]; } +sub AddPasswordPolicy +{ + my ($self, $dbIndex, $ppolicy ) = @_; + if ( ! SCR->Write(".ldapserver.database.{".$dbIndex."}.ppolicy", $ppolicy ) ) { + my $err = SCR->Error(".ldapserver"); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return YaST::YCP::Boolean(0); + } else { + return YaST::YCP::Boolean(1); + } +} BEGIN { $TYPEINFO {GetSchemaList} = ["function", [ "list" , "string"] ]; } sub GetSchemaList Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:59:40 2008 @@ -1049,29 +1049,40 @@ define boolean cb_write_ppolicy() { - y2milestone("cb_write_policy()"); -// if( UI::QueryWidget( `cb_ppolicy_overlay, `Value ) == true ){ -// boolean hashcleartext = (boolean)UI::QueryWidget( `cb_ppolicy_hashcleartext, `Value ); -// boolean uselockout = (boolean)UI::QueryWidget( `cb_ppolicy_uselockout, `Value ); -// string pp_default = (string)UI::QueryWidget( `te_ppolicy_defaultpolicy, `Value ); + string treeItem = current_tree_item; + y2milestone("cb_write_policy() treeitem: '%1'", treeItem); + integer index = (integer)widget_map[current_tree_item,"index"]:nil; + boolean result = true; + if( UI::QueryWidget( `cb_ppolicy_overlay, `Value ) == true ){ + boolean hashcleartext = (boolean)UI::QueryWidget( `cb_ppolicy_hashcleartext, `Value ); + boolean uselockout = (boolean)UI::QueryWidget( `cb_ppolicy_uselockout, `Value ); + string pp_default = (string)UI::QueryWidget( `te_ppolicy_defaultpolicy, `Value ); // map<string,string> ppolicy_old = LdapServer::GetPasswordPolicyOverlay(suffix); -// map<string,any> ppolicy = $[]; -// if (hashcleartext ) { -// ppolicy = add( ppolicy, "ppolicy_hash_cleartext", ""); -// } -// if (uselockout) { -// ppolicy = add( ppolicy, "ppolicy_use_lockout", ""); -// } -// if (pp_default != "" ) { -// if( (boolean)UI::QueryWidget( `cb_pp_append_basedn, `Value ) ) -// { -// pp_default = pp_default+","+suffix; -// } -// if (pp_default != ppolicy_old["ppolicy_default"]:nil ) { -// db = add(db, "ppolicy_default_changed", "1"); -// } -// ppolicy = add( ppolicy, "ppolicy_default", pp_default); -// } + map<string,string> ppolicy = $[]; + if (hashcleartext ) { + ppolicy = add( ppolicy, "ppolicy_hash_cleartext", ""); + } + if (uselockout) { + ppolicy = add( ppolicy, "ppolicy_use_lockout", ""); + } + if (pp_default != "" ) { + if( (boolean)UI::QueryWidget( `cb_pp_append_basedn, `Value ) ) + { + map<string,string> db = LdapServer::GetDatabase(index); + string suffix = db["suffix"]:""; + pp_default = pp_default+","+suffix; + } +// if (pp_default != ppolicy_old["ppolicy_default"]:nil ) { +// db = add(db, "ppolicy_default_changed", "1"); +// } + ppolicy = add( ppolicy, "ppolicy_default", pp_default); + } + y2milestone("Policy: %1", ppolicy); + result = LdapServer::AddPasswordPolicy( index, ppolicy ); + if ( ! result ) { + map<string, string> err = LdapServer::GetError(); + callback_error = err["msg"]:"" + "\n" + err["details"]:""; + } // list<any> pp_overlay = [ "ppolicy", ppolicy ]; // list<any> overlays = [ pp_overlay ]; // db = add( db, "overlay", overlays); @@ -1080,7 +1091,7 @@ // inclist = add(inclist, "/etc/openldap/schema/ppolicy.schema" ); // LdapServer::WriteSchemaIncludeList(inclist); // } -// } else { + } else { // map<string,string> ppolicy_map = LdapServer::GetPasswordPolicyOverlay(suffix); // if ( ppolicy_map != nil ){ // list<any> newoverlay = []; @@ -1095,8 +1106,8 @@ // }); // db["overlay"] = newoverlay; // } -// } - return true; + } + return result; } /***************************************** 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 Fri Jun 27 15:59:40 2008 @@ -284,41 +284,43 @@ ); term generalDbWidget = - `Frame ( _("General Settings"), - `VBox( - `TextEntry( `id( `te_basedn ), `opt( `disabled ), _("&Base DN") ), - `VSpacing( 0.5 ), - `VSquash( - `HBox( - `TextEntry( `id( `te_rootdn ), _("&Root DN") ), - `HSpacing( 0.5 ), - `VBox( - `Bottom( - `CheckBox( `id( `cb_append_basedn ), _("&Append Base DN") ) - ), - `VSpacing( 0.3 ) - ) + `VBox( + `InputField( `id( `te_basedn ), `opt( `disabled, `hstretch ), + _("&Base DN") ), + `VSpacing( 0.5 ), + `VSquash( + `HBox( + `InputField( `id( `te_rootdn ), `opt( `hstretch ), + _("&Root DN") ), + `HSpacing( 0.5 ), + `VBox( + `Bottom( + `CheckBox( `id( `cb_append_basedn ), _("&Append Base DN") ) + ), + `VSpacing( 0.3 ) ) - ), - `VSpacing( 0.5 ), - `Left( - `PushButton( `id( `pb_changepw ), _("Change Password") ) - ), - `VSpacing( 0.5 ), - `Left( - `CheckBox( `id( `cb_dbreadonly ), _("Database is read-only"), false ) - ), - `Left( - `CheckBox( `id( `cb_dbmonitoring ), _("Enable Monitoring"), false ) ) + ), + `VSpacing( 0.5 ), + `Left( + `PushButton( `id( `pb_changepw ), _("Change Password") ) + ), + `VSpacing( 0.5 ), + `Left( + `CheckBox( `id( `cb_dbreadonly ), _("Database is read-only"), false ) + ), + `Left( + `CheckBox( `id( `cb_dbmonitoring ), _("Enable Monitoring"), false ) ) ); term editBdbDatabase = - `VBox( - `Heading( _("Edit BDB Database") ), - `VSpacing( 1 ), - generalDbWidget + `Top( + `VBox( + `Heading( _("Edit BDB Database") ), + `VSpacing( 1 ), + generalDbWidget + ) ); term editBdbIndexes = -- 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] r48634 - in /trunk/ldap-server/src/agent: SlapdConfigAgent.cc SlapdConfigAgent.h
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:36 2008 New Revision: 48634 URL: http://svn.opensuse.org/viewcvs/yast?rev=48634&view=rev Log: some initial work on error handling Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/agent/SlapdConfigAgent.h Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:59:36 2008 @@ -117,6 +117,11 @@ } } +YCPMap SlapdConfigAgent::Error( const YCPPath &path ) +{ + return lastError; +} + YCPValue SlapdConfigAgent::Execute( const YCPPath &path, const YCPValue &arg, const YCPValue &arg2) @@ -606,16 +611,17 @@ indexstr >> dbIndex; } else { y2error("Database Index expected, got: %s", dbIndexStr.c_str() ); - return YCPNull(); + return YCPBoolean(false); } if ( dbIndex < -1 ) { y2error("Invalid database index: %d", dbIndex ); - return YCPNull(); + return YCPBoolean(false); } y2milestone("Database to write: %d", dbIndex); OlcDatabaseList::const_iterator i; + bool ret = false; for ( i = databases.begin(); i != databases.end() ; i++ ) { if ( (*i)->getEntryIndex() == dbIndex ) @@ -632,6 +638,7 @@ { (*i)->setStringValue( "olcRootPw", val->asString()->value_cstr() ); } + ret = true; } else { std::string dbComponent = path->component_str(1); y2milestone("Component '%s'", dbComponent.c_str()); @@ -658,12 +665,20 @@ if ( ! idx.empty() ) { (*i)->addIndex(attr, idx); } + ret = true; + } else { + lastError->add(YCPString("summary"), YCPString("Write Failed") ); + std::string msg = "Unsupported SCR path: `.ldapserver.database."; + msg += path->toString().c_str(); + msg += "`"; + lastError->add(YCPString("description"), YCPString(msg) ); + ret = false; } } break; } } - return YCPBoolean(false); + return YCPBoolean(ret); } YCPBoolean SlapdConfigAgent::WriteSchema( const YCPPath &path, Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.h (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.h Fri Jun 27 15:59:36 2008 @@ -27,6 +27,8 @@ const YCPValue &arg, const YCPValue &arg2 = YCPNull()); + virtual YCPMap Error( const YCPPath &path ); + virtual YCPValue Execute( const YCPPath &path, const YCPValue &arg = YCPNull(), const YCPValue &arg2 = YCPNull()); @@ -68,6 +70,7 @@ YCPString ConfigToLdif() const; private: + YCPMap lastError; OlcConfig olc; OlcDatabaseList databases; OlcSchemaList schema; -- 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] r48633 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:33 2008 New Revision: 48633 URL: http://svn.opensuse.org/viewcvs/yast?rev=48633&view=rev Log: - removed unneeded db_check callback - re-arranged ppolicy write code Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:59:33 2008 @@ -723,22 +723,6 @@ ** database handlers *****************************/ -define boolean cb_check_db() -``{ - string label =(string)widget_map[current_tree_item,"name"]:nil; - y2milestone( "calling db check handler for suffix '%1'", label ); - - string rootpw = (string)UI::QueryWidget( `te_rootpw, `Value ); - if( rootpw != (string)UI::QueryWidget( `te_valid_rootpw, `Value ) ) - { - /* Error Popup */ - callback_error = _("Password validation failed."); - return false; - } - - return true; -} - define boolean cb_write_db() ``{ integer index = (integer)widget_map[current_tree_item,"index"]:nil; @@ -802,52 +786,6 @@ // db["cryptmethod"] = (string)UI::QueryWidget( `cb_cryptmethod, `Value ); // } - // if( UI::QueryWidget( `cb_ppolicy_overlay, `Value ) == true ){ - // boolean hashcleartext = (boolean)UI::QueryWidget( `cb_ppolicy_hashcleartext, `Value ); - // boolean uselockout = (boolean)UI::QueryWidget( `cb_ppolicy_uselockout, `Value ); - // string pp_default = (string)UI::QueryWidget( `te_ppolicy_defaultpolicy, `Value ); - // map<string,string> ppolicy_old = LdapServer::GetPasswordPolicyOverlay(suffix); - // map<string,any> ppolicy = $[]; - // if (hashcleartext ) { - // ppolicy = add( ppolicy, "ppolicy_hash_cleartext", ""); - // } - // if (uselockout) { - // ppolicy = add( ppolicy, "ppolicy_use_lockout", ""); - // } - // if (pp_default != "" ) { - // if( (boolean)UI::QueryWidget( `cb_pp_append_basedn, `Value ) ) - // { - // pp_default = pp_default+","+suffix; - // } - // if (pp_default != ppolicy_old["ppolicy_default"]:nil ) { - // db = add(db, "ppolicy_default_changed", "1"); - // } - // ppolicy = add( ppolicy, "ppolicy_default", pp_default); - // } - // list<any> pp_overlay = [ "ppolicy", ppolicy ]; - // list<any> overlays = [ pp_overlay ]; - // db = add( db, "overlay", overlays); - // list<string> inclist = LdapServer::ReadSchemaIncludeList(); - // if(! contains( inclist, "/etc/openldap/schema/ppolicy.schema" ) ){ - // inclist = add(inclist, "/etc/openldap/schema/ppolicy.schema" ); - // LdapServer::WriteSchemaIncludeList(inclist); - // } - // } else { - // map<string,string> ppolicy_map = LdapServer::GetPasswordPolicyOverlay(suffix); - // if ( ppolicy_map != nil ){ - // list<any> newoverlay = []; - // list<any> empty_pp_ol = ["ppolicy", nil ]; - // integer i = 0; - // foreach( list<any> i, db["overlay"]:[], { - // if ((string)i[0]:"" != "ppolicy") { - // newoverlay = add(newoverlay, i); - // } else { - // newoverlay = add(newoverlay, empty_pp_ol); - // } - // }); - // db["overlay"] = newoverlay; - // } - // } // string checkResult = LdapServer::CheckDatabase( db ); // if( checkResult != "" ) { // callback_error = checkResult; @@ -1109,6 +1047,58 @@ return true; } +define boolean cb_write_ppolicy() +{ + y2milestone("cb_write_policy()"); +// if( UI::QueryWidget( `cb_ppolicy_overlay, `Value ) == true ){ +// boolean hashcleartext = (boolean)UI::QueryWidget( `cb_ppolicy_hashcleartext, `Value ); +// boolean uselockout = (boolean)UI::QueryWidget( `cb_ppolicy_uselockout, `Value ); +// string pp_default = (string)UI::QueryWidget( `te_ppolicy_defaultpolicy, `Value ); +// map<string,string> ppolicy_old = LdapServer::GetPasswordPolicyOverlay(suffix); +// map<string,any> ppolicy = $[]; +// if (hashcleartext ) { +// ppolicy = add( ppolicy, "ppolicy_hash_cleartext", ""); +// } +// if (uselockout) { +// ppolicy = add( ppolicy, "ppolicy_use_lockout", ""); +// } +// if (pp_default != "" ) { +// if( (boolean)UI::QueryWidget( `cb_pp_append_basedn, `Value ) ) +// { +// pp_default = pp_default+","+suffix; +// } +// if (pp_default != ppolicy_old["ppolicy_default"]:nil ) { +// db = add(db, "ppolicy_default_changed", "1"); +// } +// ppolicy = add( ppolicy, "ppolicy_default", pp_default); +// } +// list<any> pp_overlay = [ "ppolicy", ppolicy ]; +// list<any> overlays = [ pp_overlay ]; +// db = add( db, "overlay", overlays); +// list<string> inclist = LdapServer::ReadSchemaIncludeList(); +// if(! contains( inclist, "/etc/openldap/schema/ppolicy.schema" ) ){ +// inclist = add(inclist, "/etc/openldap/schema/ppolicy.schema" ); +// LdapServer::WriteSchemaIncludeList(inclist); +// } +// } else { +// map<string,string> ppolicy_map = LdapServer::GetPasswordPolicyOverlay(suffix); +// if ( ppolicy_map != nil ){ +// list<any> newoverlay = []; +// list<any> empty_pp_ol = ["ppolicy", nil ]; +// integer i = 0; +// foreach( list<any> i, db["overlay"]:[], { +// if ((string)i[0]:"" != "ppolicy") { +// newoverlay = add(newoverlay, i); +// } else { +// newoverlay = add(newoverlay, empty_pp_ol); +// } +// }); +// db["overlay"] = newoverlay; +// } +// } + return true; +} + /***************************************** ** tree structure definition ** *****************************************/ @@ -1198,7 +1188,8 @@ "widget" : editPolicy, "index" : index, "cb_read" : ``(cb_read_ppolicy() ), - "cb_input" : ``(cb_input_ppolicy() ) + "cb_input" : ``(cb_input_ppolicy() ), + "cb_write" : ``(cb_write_ppolicy() ) ]; map<string,any> item_map = $[ "name" : label, @@ -1208,7 +1199,6 @@ "new_db" : new_db, "dynamic" : true, "help_page" : "database_detail", - "cb_check" : ``( cb_check_db() ), "cb_read" : ``( cb_read_db() ), "cb_write" : ``( cb_write_db() ), "cb_input" : ``( cb_input_db() ) -- 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] r48632 - in /trunk/ldap-server/src: tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:30 2008 New Revision: 48632 URL: http://svn.opensuse.org/viewcvs/yast?rev=48632&view=rev Log: ppolicy UI work 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.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:59:30 2008 @@ -916,11 +916,15 @@ string rootdn = db["rootdn"]:""; boolean append_checked = false; - integer pos = find( rootdn, db["suffix"]:"" ); + integer pos = search( rootdn, db["suffix"]:"" ); if( pos > -1 ) { - rootdn = substring( rootdn, 0, pos-1 ); - append_checked = true; + string chkSuffix = substring( rootdn, pos ); + if (chkSuffix == db["suffix"]:"") + { + rootdn = substring( rootdn, 0, pos-1 ); + append_checked = true; + } } UI::ChangeWidget( `te_rootdn, `Value, rootdn ); UI::ChangeWidget( `cb_append_basedn, `Value, append_checked ); @@ -928,62 +932,15 @@ // UI::ChangeWidget( `te_valid_rootpw, `Value, db["passwd"]:"" ); // UI::ChangeWidget( `cb_cryptmethod, `Value, (string)db["cryptmethod"]:"SSHA" ); // -// // Check for ppolicy overlay -// map<string,string> ppolicy_map = LdapServer::GetPasswordPolicyOverlay(suffix); -// if ( ppolicy_map != nil ){ -// UI::ChangeWidget( `cb_ppolicy_overlay, `Value, true ); -// string pp_hash_cleartext = ppolicy_map["ppolicy_hash_cleartext"]:nil; -// string pp_use_lockout = ppolicy_map["ppolicy_use_lockout"]:nil; -// string pp_default = ppolicy_map["ppolicy_default"]:nil; -// boolean pp_append_checked = false; -// integer pos = find( pp_default, suffix ); -// if( pos > -1 ) -// { -// pp_default = substring( pp_default, 0, pos-1 ); -// pp_append_checked = true; -// } -// if ( pp_hash_cleartext != nil ){ -// UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Value, true ); -// } else { -// UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Value, false ); -// } -// if ( pp_use_lockout != nil ){ -// UI::ChangeWidget( `cb_ppolicy_uselockout, `Value, true ); -// } else { -// UI::ChangeWidget( `cb_ppolicy_uselockout, `Value, false ); -// } -// if ( pp_default != nil ){ -// UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Value, pp_default ); -// UI::ChangeWidget( `cb_pp_append_basedn, `Value, pp_append_checked ); -// } else { -// UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Value, "" ); -// UI::ChangeWidget( `cb_pp_append_basedn, `Value, true ); -// } -// } else { -// UI::ChangeWidget( `cb_ppolicy_overlay, `Value, false ); -// UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Enabled , false ); -// UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , false ); -// UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Enabled , false ); -// } return true; } define boolean cb_input_db() ``{ - string suffix = current_tree_item; - y2milestone( "calling db input handler for suffix '%1'", suffix ); + string treeItem = current_tree_item; + y2milestone( "calling db input handler for item '%1'", treeItem ); integer index = (integer)widget_map[current_tree_item,"index"]:nil; - if ( handler_cmd == `cb_ppolicy_overlay ) { - if ( UI::QueryWidget( `cb_ppolicy_overlay, `Value ) == true ) { - UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Enabled , true ); - UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , true ); - UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Enabled , true ); - } else { - UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Enabled , false ); - UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , false ); - UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Enabled , false ); - } - } else if ( handler_cmd == `pb_changepw ) { + if ( handler_cmd == `pb_changepw ) { map<string,string> newpw = ChangeAdminPassword(); if ( newpw != nil ) { @@ -1081,6 +1038,77 @@ return true; } +define boolean cb_input_ppolicy() +{ + y2milestone("cb_input_ppolicy()"); + string treeItem = current_tree_item; + y2milestone( "calling db input handler for item '%1'", treeItem ); + integer index = (integer)widget_map[current_tree_item,"index"]:nil; + if ( handler_cmd == `cb_ppolicy_overlay ) { + if ( UI::QueryWidget( `cb_ppolicy_overlay, `Value ) == true ) { + UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Enabled , true ); + UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , true ); + UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Enabled , true ); + UI::ChangeWidget( `cb_pp_append_basedn, `Enabled, true ); + } else { + UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Enabled , false ); + UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , false ); + UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Enabled , false ); + UI::ChangeWidget( `cb_pp_append_basedn, `Enabled, false ); + } + } + return true; +} + +define boolean cb_read_ppolicy() +{ + y2milestone("cb_read_ppolicy()"); + // Check for ppolicy overlay + //map<string,string> ppolicy_map = LdapServer::GetPasswordPolicyOverlay(suffix); + string suffix = ""; + map<string,string> ppolicy_map = nil; + if ( ppolicy_map != nil ){ + UI::ChangeWidget( `cb_ppolicy_overlay, `Value, true ); + string pp_hash_cleartext = ppolicy_map["ppolicy_hash_cleartext"]:nil; + string pp_use_lockout = ppolicy_map["ppolicy_use_lockout"]:nil; + string pp_default = ppolicy_map["ppolicy_default"]:nil; + boolean pp_append_checked = false; + integer pos = search( pp_default, suffix ); + if( pos > -1 ) + { + string chkSuffix = substring( pp_default, pos ); + if ( chkSuffix == suffix ) + { + pp_default = substring( pp_default, 0, pos-1 ); + pp_append_checked = true; + } + } + if ( pp_hash_cleartext != nil ){ + UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Value, true ); + } else { + UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Value, false ); + } + if ( pp_use_lockout != nil ){ + UI::ChangeWidget( `cb_ppolicy_uselockout, `Value, true ); + } else { + UI::ChangeWidget( `cb_ppolicy_uselockout, `Value, false ); + } + if ( pp_default != nil ){ + UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Value, pp_default ); + UI::ChangeWidget( `cb_pp_append_basedn, `Value, pp_append_checked ); + } else { + UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Value, "" ); + UI::ChangeWidget( `cb_pp_append_basedn, `Value, true ); + } + } else { + UI::ChangeWidget( `cb_ppolicy_overlay, `Value, false ); + UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Enabled , false ); + UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , false ); + UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Enabled , false ); + } + return true; +} + /***************************************** ** tree structure definition ** *****************************************/ @@ -1165,9 +1193,16 @@ "cb_read" : ``(cb_read_bdb_index() ), "cb_input" : ``(cb_input_bdb_index() ) ]; + map<string, any> dbPpolicy = $[ + "name" : _("Password Policy Configuration"), + "widget" : editPolicy, + "index" : index, + "cb_read" : ``(cb_read_ppolicy() ), + "cb_input" : ``(cb_input_ppolicy() ) + ]; map<string,any> item_map = $[ "name" : label, - "children" : [ item_name + "_index" ], + "children" : [ item_name + "_index", item_name + "_ppolicy" ], "index" : index, "widget" : editBdbDatabase, "new_db" : new_db, @@ -1181,6 +1216,7 @@ y2milestone( "adding database item '%1' as '%2'", label, item_name ); widget_map[item_name] = item_map; widget_map[item_name + "_index"] = dbIndex; + widget_map[item_name + "_ppolicy"] = dbPpolicy; widget_map["databases","children"] = add( widget_map["databases","children"]:[], item_name ); } 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 Fri Jun 27 15:59:30 2008 @@ -338,9 +338,10 @@ ) ); term editPolicy = - `VBox( - `VSpacing( 1 ), - `Frame( _("Password Policy Settings"), + `Top( + `VBox( + `VSpacing( 1 ), + `Heading( _("Password Policy Settings") ), `VBox( `VSpacing(0.25), `HBox( `CheckBox( `id( `cb_ppolicy_overlay ),`opt(`notify ), @@ -362,7 +363,8 @@ ), `VSquash( `HBox( - `TextEntry( `id( `te_ppolicy_defaultpolicy ), + `InputField( `id( `te_ppolicy_defaultpolicy ), + `opt( `hstretch ), _("Default Policy Object DN"), "cn=Default Policy" ), `HSpacing( 0.5 ), -- 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] r48631 - /trunk/ldap-server/src/widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:26 2008 New Revision: 48631 URL: http://svn.opensuse.org/viewcvs/yast?rev=48631&view=rev Log: correct indenting Modified: trunk/ldap-server/src/widgets.ycp 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 Fri Jun 27 15:59:26 2008 @@ -301,9 +301,9 @@ ) ), `VSpacing( 0.5 ), - `Left( - `PushButton( `id( `pb_changepw ), _("Change Password") ) - ), + `Left( + `PushButton( `id( `pb_changepw ), _("Change Password") ) + ), `VSpacing( 0.5 ), `Left( `CheckBox( `id( `cb_dbreadonly ), _("Database is read-only"), false ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0