Author: jsuchome Date: Wed Mar 23 08:49:41 2011 New Revision: 63629 URL: http://svn.opensuse.org/viewcvs/yast?rev=63629&view=rev Log: - remove 'ldap' from nsswitch.conf when sssd is configured (bnc#681818) - remove ldap and ldap-account_only PAM modules when sssd is set - 2.17.25 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION?rev=63629&r1=63628&r2=63629&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION Wed Mar 23 08:49:41 2011 @@ -1 +1 @@ -2.17.24 +2.17.25 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes?rev=63629&r1=63628&r2=63629&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes Wed Mar 23 08:49:41 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Mar 23 08:46:38 CET 2011 - jsuchome@suse.cz + +- remove 'ldap' from nsswitch.conf when sssd is configured + (bnc#681818) +- remove ldap and ldap-account_only PAM modules when sssd is set +- 2.17.25 + +------------------------------------------------------------------- Fri Mar 18 17:33:17 CET 2011 - jsuchome@suse.cz - architecture dependent packages for sssd Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp?rev=63629&r1=63628&r2=63629&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp Wed Mar 23 08:49:41 2011 @@ -2679,15 +2679,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 { @@ -2736,7 +2757,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 ( -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org