Hello community, here is the log from the commit of package yast2-ldap-client for openSUSE:Factory checked in at 2012-03-23 12:12:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ldap-client (Old) and /work/SRC/openSUSE:Factory/.yast2-ldap-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ldap-client", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ldap-client/yast2-ldap-client.changes 2012-02-23 15:35:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ldap-client.new/yast2-ldap-client.changes 2012-03-23 12:12:14.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Mar 22 11:16:27 CET 2012 - [email protected] + +- simplify ldap_config client for only one usage from users module +- 2.22.7 + +------------------------------------------------------------------- +Tue Mar 20 16:33:14 CET 2012 - [email protected] + +- removed user specific settings and texts (fate#313143) +- warn about usage of nss_ldap +- 2.22.6 + +------------------------------------------------------------------- Old: ---- yast2-ldap-client-2.22.5.tar.bz2 New: ---- yast2-ldap-client-2.22.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.YCvG8q/_old 2012-03-23 12:12:17.000000000 +0100 +++ /var/tmp/diff_new_pack.YCvG8q/_new 2012-03-23 12:12:17.000000000 +0100 @@ -18,7 +18,7 @@ Name: yast2-ldap-client -Version: 2.22.5 +Version: 2.22.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-ldap-client-2.22.5.tar.bz2 -> yast2-ldap-client-2.22.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.22.5/VERSION new/yast2-ldap-client-2.22.7/VERSION --- old/yast2-ldap-client-2.22.5/VERSION 2012-02-22 16:38:37.000000000 +0100 +++ new/yast2-ldap-client-2.22.7/VERSION 2012-03-22 11:16:44.000000000 +0100 @@ -1 +1 @@ -2.22.5 +2.22.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.22.5/src/ldap_config.ycp new/yast2-ldap-client-2.22.7/src/ldap_config.ycp --- old/yast2-ldap-client-2.22.5/src/ldap_config.ycp 2012-01-19 15:36:39.000000000 +0100 +++ new/yast2-ldap-client-2.22.7/src/ldap_config.ycp 2012-03-22 08:10:49.000000000 +0100 @@ -25,7 +25,7 @@ * (e.g. user/group templates) * Authors: Jiri Suchomel <[email protected]> * - * $Id: ldap_config.ycp 67232 2012-01-19 14:36:33Z jsuchome $ + * $Id: ldap_config.ycp 67685 2012-03-22 07:11:00Z jsuchome $ */ { @@ -41,27 +41,19 @@ } y2debug ("param=%1", param); - if (param != "late_dialog") { - Wizard::CreateDialog(); - Wizard::SetDesktopTitleAndIcon("ldap"); - } - - ReadDialog (); // TODO not necessary when already done... - any ret = LDAPReadDialog (); if (ret != `next) + { return ret; - - if (param == "late_dialog") { - Wizard::CreateDialog(); - Wizard::SetDesktopTitleAndIcon("ldap"); } + Wizard::CreateDialog(); + Wizard::SetDesktopTitleAndIcon("ldap"); + ret = ModuleConfigurationDialog (); if (ret == `next && Ldap::ldap_modified) { - // TODO maybe add question "Really Write?" if (Ldap::WriteLDAP (Ldap::config_modules)) Ldap::WriteLDAP (Ldap::templates); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.22.5/src/ui.ycp new/yast2-ldap-client-2.22.7/src/ui.ycp --- old/yast2-ldap-client-2.22.5/src/ui.ycp 2012-02-21 15:46:04.000000000 +0100 +++ new/yast2-ldap-client-2.22.7/src/ui.ycp 2012-03-20 16:35:02.000000000 +0100 @@ -25,7 +25,7 @@ * Authors: Thorsten Kukuk <[email protected]> * Anas Nashif <[email protected]> * - * $Id: ui.ycp 67491 2012-02-21 10:06:24Z jsuchome $ + * $Id: ui.ycp 67671 2012-03-20 15:34:59Z jsuchome $ * * All user interface functions. */ @@ -464,6 +464,25 @@ UI::ChangeWidget (`id(`server),`ValidChars, Address::ValidChars + " "); + if (Ldap::start && !Ldap::sssd) + { + if (Popup::ContinueCancel ( + // question popup +_("Previous LDAP client configuration was detected. + +Current configuration does not use SSSD but nss_ldap. +Only SSSD based configurations are supported by YaST. +Do you want to continue and use SSSD or cancel to keep the old configuration?"))) + { + Ldap::sssd = true; + ldap_tls = true; + } + else + { + return `cancel; + } + } + symbol result = `not_next; do { result = (symbol) UI::UserInput (); @@ -744,22 +763,12 @@ _("<p>Press <b>Configure</b> to configure settings stored on the LDAP server. You will be asked for the password if you are not connected yet or have changed your configuration.</p> -") + - - // help text caption 3 - _("<p><b>Home Directories</b></p>") + - - // help text 1/1 - _("<p>If home directories of users should be stored on this machine, -check the appropriate option. Changing this value does not cause any direct -action. It is only information for the YaST users module, which manages -user home directories.</p> ") + ]; string bind_dn = Ldap::bind_dn; string base_dn = Ldap::GetBaseDN (); - boolean file_server = Ldap::file_server; string member_attribute = Ldap::member_attribute; string base_config_dn = Ldap::GetMainConfigDN(); boolean create_ldap = Ldap::create_ldap; @@ -918,12 +927,6 @@ `Left (`CheckBox (`id(`create_ldap), // checkbox label _("Crea&te Default Configuration Objects"), create_ldap)), - `VSpacing(0.4), - `Left (`CheckBox (`id(`file_server), - // checkbox label - _("&Home Directories on This Machine"), - file_server) - ), `VSpacing(0.5), `Right (`PushButton (`id(`configure), // pushbutton label @@ -984,7 +987,6 @@ { bind_dn = (string) UI::QueryWidget(`id(`bind_dn), `Value); base_config_dn=(string)UI::QueryWidget(`id(`base_config_dn),`Value); - file_server = (boolean)UI::QueryWidget(`id(`file_server), `Value); create_ldap = (boolean) UI::QueryWidget(`id(`create_ldap),`Value); append_base = (boolean) UI::QueryWidget (`id(`append), `Value); if (append_base && ! issubstring (bind_dn, base_dn) && bind_dn != "") @@ -1055,7 +1057,6 @@ if (Ldap::GetMainConfigDN() != base_config_dn || Ldap::bind_dn != bind_dn || - Ldap::file_server != file_server || Ldap::member_attribute != member_attribute || Ldap::create_ldap != create_ldap || Ldap::pam_password != pam_password || @@ -1068,7 +1069,6 @@ { Ldap::bind_dn = bind_dn; Ldap::base_config_dn = base_config_dn; - Ldap::file_server = file_server; Ldap::member_attribute = member_attribute; Ldap::create_ldap = create_ldap; Ldap::pam_password = pam_password; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
