Author: jsuchome Date: Fri Feb 1 11:39:29 2008 New Revision: 44093 URL: http://svn.opensuse.org/viewcvs/yast?rev=44093&view=rev Log: - correctly update nss_base_* values when base DN was changed, do not write when the values are same as base DN (#342727) - restart zmd only if installed - 2.13.29 Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-client/VERSION branches/SuSE-SLE-10-SP2-Branch/ldap-client/package/yast2-ldap-client.changes branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/Ldap.ycp branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/ui.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ldap-client/VERSION?rev=44093&r1=44092&r2=44093&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ldap-client/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/ldap-client/VERSION Fri Feb 1 11:39:29 2008 @@ -1 +1 @@ -2.13.28 +2.13.29 Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ldap-client/package/yast2-ldap-client.changes?rev=44093&r1=44092&r2=44093&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ldap-client/package/yast2-ldap-client.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/ldap-client/package/yast2-ldap-client.changes Fri Feb 1 11:39:29 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 31 10:44:21 CET 2008 - jsuchome@suse.cz + +- correctly update nss_base_* values when base DN was changed, + do not write when the values are same as base DN (#342727) +- restart zmd only if installed +- 2.13.29 + +------------------------------------------------------------------- Thu Aug 2 17:05:06 CEST 2007 - jsuchome@suse.cz - do not reinitialize LDAP connection when not needed (#296284) Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/Ldap.ycp?rev=44093&r1=44092&r2=44093&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/Ldap.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/Ldap.ycp Fri Feb 1 11:39:29 2008 @@ -616,9 +616,9 @@ ldap_v2 = (ReadLdapConfEntry ("ldap_version", "3") == "2"); ldap_tls = (ReadLdapConfEntry ("ssl", "no") == "start_tls"); - nss_base_passwd = ReadLdapConfEntry ("nss_base_passwd", ""); - nss_base_shadow = ReadLdapConfEntry ("nss_base_shadow",nss_base_passwd); - nss_base_group = ReadLdapConfEntry ("nss_base_group", ""); + nss_base_passwd = ReadLdapConfEntry ("nss_base_passwd", domain); + nss_base_shadow = ReadLdapConfEntry ("nss_base_shadow", domain); + nss_base_group = ReadLdapConfEntry ("nss_base_group", domain); pam_password = ReadLdapConfEntry ("pam_password", "crypt"); @@ -2160,6 +2160,19 @@ else WriteLdapConfEntry ("ssl", "no"); + // save the user and group bases + user_base = domain; + group_base = domain; + + WriteLdapConfEntry ("nss_base_passwd", + (nss_base_passwd != domain && nss_base_passwd != "") ? + nss_base_passwd : nil); + WriteLdapConfEntry ("nss_base_shadow", + (nss_base_shadow != domain && nss_base_shadow != "") ? + nss_base_shadow : nil); + WriteLdapConfEntry ("nss_base_group", + (nss_base_group != domain && nss_base_group != "") ? + nss_base_group : nil); } if (start) // ldap used for authentocation { @@ -2184,17 +2197,6 @@ AddLdapConfEntry ("pam_filter", "objectclass=posixAccount"); } - // save the user and group bases - user_base = domain; - group_base = domain; - - WriteLdapConfEntry ("nss_base_passwd", - (nss_base_passwd != "")? nss_base_passwd : user_base); - WriteLdapConfEntry ("nss_base_shadow", - (nss_base_shadow != "")? nss_base_shadow : user_base); - WriteLdapConfEntry ("nss_base_group", - (nss_base_group != "")? nss_base_group : user_base); - // override LDAPNOINIT (#217701) WriteLdapConfEntry ("tls_checkpeer", "no"); @@ -2336,7 +2338,7 @@ Service::Restart ("dbus"); } - if (Service::Status ("novell-zmd") == 0) + if (Package::Installed ("zmd") && Service::Status("novell-zmd")== 0) { Service::RunInitScript ("novell-zmd", "try-restart"); } Modified: branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/ui.ycp?rev=44093&r1=44092&r2=44093&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/ui.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/ldap-client/src/ui.ycp Fri Feb 1 11:39:29 2008 @@ -467,6 +467,13 @@ if (result == `next || result == `advanced) { + if (Ldap::GetDomain () != domain && + Ldap::nss_base_passwd == Ldap::GetDomain ()) + { + Ldap::nss_base_passwd = domain; + Ldap::nss_base_shadow = domain; + Ldap::nss_base_group = domain; + } Pam::SetMkHomeDir((boolean)UI::QueryWidget(`id(`mkhomedir),`Value)); if (Ldap::start != start || Ldap::GetDomain() != domain || Ldap::server != server || Ldap::ldap_v2 != ldap_v2 || -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org