Author: jsuchome Date: Wed Nov 16 17:08:13 2011 New Revision: 66851 URL: http://svn.opensuse.org/viewcvs/yast?rev=66851&view=rev Log: - correctly handle sssd config with more LDAP servers (bnc#729174) - 2.21.12 Modified: branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp Modified: branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION?rev=66851&r1=66850&r2=66851&view=diff ============================================================================== --- branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION (original) +++ branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION Wed Nov 16 17:08:13 2011 @@ -1 +1 @@ -2.21.11 +2.21.12 Modified: branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes?rev=66851&r1=66850&r2=66851&view=diff ============================================================================== --- branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes (original) +++ branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes Wed Nov 16 17:08:13 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 15:31:30 CET 2011 - jsuchome@suse.cz + +- correctly handle sssd config with more LDAP servers (bnc#729174) +- 2.21.12 + +------------------------------------------------------------------- Thu Sep 29 12:41:38 CEST 2011 - visnov@suse.cz - set dialog title Modified: branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp?rev=66851&r1=66850&r2=66851&view=diff ============================================================================== --- branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp (original) +++ branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp Wed Nov 16 17:08:13 2011 @@ -606,7 +606,7 @@ list<string> kdcs = (list<string>) SCR::Read (add (add (.etc.krb5_conf.v, krb5_realm), "kdc")); if (kdcs == nil) kdcs = []; - krb5_kdcip = mergestring (kdcs, " "); + krb5_kdcip = mergestring (kdcs, ","); return true; } @@ -2238,7 +2238,11 @@ path domain = add (.etc.sssd_conf.v, "domain/default"); - string uri = sformat ("ldap://%1", String::FirstChunk (server, " \t")); + string uri = mergestring ( + maplist (string s, splitstring (server, " \t"), + ``(sformat ("ldap://%1", s)) + ), "," + ); SCR::Write (add (domain, "ldap_uri"), uri); SCR::Write (add (domain, "ldap_search_base"), base_dn); SCR::Write (add (domain, "ldap_schema"), sssd_ldap_schema); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org