Author: jsuchome Date: Fri Jul 27 12:24:15 2007 New Revision: 39741 URL: http://svn.opensuse.org/viewcvs/yast?rev=39741&view=rev Log: - use "files ldap" instead of "compat" for group entry in /etc/nsswitch.conf (F302064) - 2.15.11 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=39741&r1=39740&r2=39741&view=diff ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Fri Jul 27 12:24:15 2007 @@ -1 +1 @@ -2.15.10 +2.15.11 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-client.changes?rev=39741&r1=39740&r2=39741&view=diff ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri Jul 27 12:24:15 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jul 27 12:01:03 CEST 2007 - jsuchome@suse.cz + +- use "files ldap" instead of "compat" for group entry in + /etc/nsswitch.conf (F302064) +- 2.15.11 + +------------------------------------------------------------------- Thu Jun 7 16:20:56 CEST 2007 - jsuchome@suse.cz - fix dialog layout for ncurses mode (#280398) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=39741&r1=39740&r2=39741&view=diff ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Fri Jul 27 12:24:15 2007 @@ -2268,19 +2268,25 @@ { // pam settigs Pam::Add ("ldap"); - // modify sources in /etc/nsswitch.conf - foreach (string db, [ "passwd", "group" ], { - string new_db = db+"_compat"; - nsswitch [new_db] = union (nsswitch[new_db]:[], ["ldap"]); - Nsswitch::WriteDb (db, ["compat"]); - Nsswitch::WriteDb (new_db, nsswitch[new_db]:["ldap"]); - }); + Nsswitch::WriteDb ("passwd", ["compat"]); + Nsswitch::WriteDb ("passwd_compat", (list<string>) + union (nsswitch["passwd_compat"]:[], ["ldap"])); - foreach (string db, [ "services" ,"netgroup", "aliases" ], { + foreach (string db, ["services","netgroup","aliases"], { Nsswitch::WriteDb (db, ["files", "ldap"]); }); + if (contains (nsswitch["group"]:[], "compat") && + contains (nsswitch["group_compat"]:[], "ldap")) + { + y2milestone ("group_compat present, not changing"); + } + else + { + Nsswitch::WriteDb ("group", ["files", "ldap"]); + } + Nsswitch::Write (); } Autologin::Write (write_only); @@ -2292,7 +2298,7 @@ string new_db = db+"_compat"; nsswitch [db] = filter ( string v, nsswitch[db]:[], ``(v != "ldap")); - if (nsswitch[db]:[] == []) + if (nsswitch[db]:[] == [] || nsswitch[db]:[] == ["files"]) nsswitch [db] = ["compat"]; nsswitch [new_db] = filter ( string v, nsswitch[new_db]:[], ``(v != "ldap")); @@ -2300,7 +2306,7 @@ Nsswitch::WriteDb (new_db, nsswitch[new_db]:[]); }); - foreach (string db, [ "services" ,"netgroup", "aliases" ], { + foreach (string db, ["services" ,"netgroup", "aliases" ], { list<string> db_l = (list<string>) filter ( string v, Nsswitch::ReadDb (db), ``(v != "ldap")); if (db_l == []) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org