Hello community, here is the log from the commit of package yast2-ldap-client for openSUSE:Factory checked in at Thu Mar 24 09:49:37 CET 2011.
-------- --- yast2-ldap-client/yast2-ldap-client.changes 2011-03-18 15:31:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ldap-client/yast2-ldap-client.changes 2011-03-23 12:15:47.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Mar 23 12:13:16 CET 2011 - [email protected] + +- aborting in Stage::cont does not abort installation (bnc#678650) +- 2.21.4 + +------------------------------------------------------------------- +Wed Mar 23 08:45:31 CET 2011 - [email protected] + +- remove 'ldap' from nsswitch.conf when sssd is configured + (bnc#681818) +- remove ldap and ldap-account_only PAM modules when sssd is set +- 2.21.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ldap-client-2.21.2.tar.bz2 New: ---- yast2-ldap-client-2.21.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.cYUe3N/_old 2011-03-24 09:46:34.000000000 +0100 +++ /var/tmp/diff_new_pack.cYUe3N/_new 2011-03-24 09:46:34.000000000 +0100 @@ -19,11 +19,11 @@ Name: yast2-ldap-client -Version: 2.21.2 +Version: 2.21.4 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-client-2.21.2.tar.bz2 +Source0: yast2-ldap-client-2.21.4.tar.bz2 Prefix: /usr @@ -58,7 +58,7 @@ OpenLDAP server will be used for user authentication. %prep -%setup -n yast2-ldap-client-2.21.2 +%setup -n yast2-ldap-client-2.21.4 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-ldap-client-2.21.2.tar.bz2 -> yast2-ldap-client-2.21.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.21.2/VERSION new/yast2-ldap-client-2.21.4/VERSION --- old/yast2-ldap-client-2.21.2/VERSION 2011-03-18 15:30:01.000000000 +0100 +++ new/yast2-ldap-client-2.21.4/VERSION 2011-03-23 12:13:49.000000000 +0100 @@ -1 +1 @@ -2.21.2 +2.21.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.21.2/src/Ldap.ycp new/yast2-ldap-client-2.21.4/src/Ldap.ycp --- old/yast2-ldap-client-2.21.2/src/Ldap.ycp 2011-03-17 09:14:41.000000000 +0100 +++ new/yast2-ldap-client-2.21.4/src/Ldap.ycp 2011-03-23 08:47:37.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <[email protected]> * Anas Nashif <[email protected]> * - * $Id: Ldap.ycp 63583 2011-03-17 08:14:40Z jsuchome $ + * $Id: Ldap.ycp 63626 2011-03-23 07:47:34Z jsuchome $ */ { @@ -2648,15 +2648,36 @@ { Pam::Add ("sss"); // Add "sss" to the passwd and group databases in nsswitch.conf - Nsswitch::WriteDb ("passwd", (list<string>) - union (nsswitch["passwd"]:[], ["sss"])); - Nsswitch::WriteDb ("group", (list<string>) - union (nsswitch["group"]:[], ["sss"])); + + foreach (string db, [ "passwd", "group" ], { + // replace 'ldap' with sss + nsswitch [db] = filter ( + string v, nsswitch[db]:[], ``(v != "ldap")); + nsswitch [db] = union (nsswitch[db]:[], ["sss"]); + Nsswitch::WriteDb (db, nsswitch[db]:["sss"]); + + // remove 'ldap' from _compat entries + string new_db = db+"_compat"; + nsswitch [new_db] = filter ( + string v, nsswitch[new_db]:[], ``(v != "ldap")); + Nsswitch::WriteDb (new_db, nsswitch[new_db]:[]); + }); + // remove ldap entries from ldap-only db's + foreach (string db, ["services" ,"netgroup", "aliases" ], { + list<string> db_l = (list<string>) filter ( + string v, Nsswitch::ReadDb (db), ``(v != "ldap")); + if (db_l == []) + db_l = ["files"]; + Nsswitch::WriteDb (db, db_l); + }); + if (Pam::Enabled("krb5")) { y2milestone ("configuring 'sss', so 'krb5' will be removed"); + Pam::Remove ("ldap-account_only"); Pam::Remove ("krb5"); } + Pam::Remove ("ldap"); } else { @@ -2705,7 +2726,6 @@ } else if (!oes) // ldap is not used { - //TODO: first check, if nss needs to be updated... foreach (string db, [ "passwd", "group" ], ``{ string new_db = db+"_compat"; nsswitch [db] = filter ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.21.2/src/ldap.ycp new/yast2-ldap-client-2.21.4/src/ldap.ycp --- old/yast2-ldap-client-2.21.2/src/ldap.ycp 2011-03-18 15:29:07.000000000 +0100 +++ new/yast2-ldap-client-2.21.4/src/ldap.ycp 2011-03-18 15:30:17.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <[email protected]> * Anas Nashif <[email protected]> * - * $Id: ldap.ycp 47528 2008-05-14 13:14:51Z jsuchome $ + * $Id: ldap.ycp 63596 2011-03-18 14:30:16Z jsuchome $ */ /*** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.21.2/src/ui.ycp new/yast2-ldap-client-2.21.4/src/ui.ycp --- old/yast2-ldap-client-2.21.2/src/ui.ycp 2011-02-04 15:19:58.000000000 +0100 +++ new/yast2-ldap-client-2.21.4/src/ui.ycp 2011-03-23 11:41:00.000000000 +0100 @@ -44,15 +44,7 @@ */ define symbol ReallyAbort () ``{ - boolean ret = true; - if (!Stage::cont () || contains (WFM::Args (), "from_users")) - { - ret = Modified() ? Popup::ReallyAbort (true) : true; - } - else - { - ret = Popup::ConfirmAbort (`incomplete); - } + boolean ret = (Modified() || Stage::cont ()) ? Popup::ReallyAbort (true) : true; if ( ret ) return `abort; else return `back; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
