Author: jsuchome Date: Wed Nov 16 15:41:19 2011 New Revision: 66835 URL: http://svn.opensuse.org/viewcvs/yast?rev=66835&view=rev Log: - correctly handle sssd config with more LDAP servers (bnc#729174) - 2.22.1 Added: trunk/ldap-client/testsuite/tests/Export3.err trunk/ldap-client/testsuite/tests/Export3.out trunk/ldap-client/testsuite/tests/Export3.ycp (with props) 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=66835&r1=66834&r2=66835&view=diff ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Nov 16 15:41:19 2011 @@ -1 +1 @@ -2.22.0 +2.22.1 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=66835&r1=66834&r2=66835&view=diff ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Nov 16 15:41:19 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 15:35:53 CET 2011 - jsuchome@suse.cz + +- correctly handle sssd config with more LDAP servers (bnc#729174) +- 2.22.1 + +------------------------------------------------------------------- Wed Nov 16 12:31:32 CET 2011 - jsuchome@suse.cz - merged texts from proofreading Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=66835&r1=66834&r2=66835&view=diff ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Wed Nov 16 15:41:19 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); Added: trunk/ldap-client/testsuite/tests/Export3.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Export3.err?rev=66835&view=auto ============================================================================== (empty) Added: trunk/ldap-client/testsuite/tests/Export3.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Export3.out?rev=66835&view=auto ============================================================================== --- trunk/ldap-client/testsuite/tests/Export3.out (added) +++ trunk/ldap-client/testsuite/tests/Export3.out Wed Nov 16 15:41:19 2011 @@ -0,0 +1,27 @@ +Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" nil +Read .etc.ldap_conf.v."/etc/ldap.conf"."host" "localhost" +Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" +Read .etc.ldap_conf.v."/etc/ldap.conf"."ldap_version" nil +Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil +Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" +Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertfile" nil +Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_checkpeer" nil +Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_passwd" nil +Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_shadow" nil +Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_group" "ou=group,dc=suse,dc=cz" +Read .etc.ldap_conf.v."/etc/ldap.conf"."pam_password" "crypt" +Read .sysconfig.ldap.BASE_CONFIG_DN nil +Read .sysconfig.ldap.FILE_SERVER "no" +Read .sysconfig.ldap.BIND_DN "uid=manager,dc=suse,dc=cz" +Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_map_attribute" 0 +Execute .passwd.init $["base_directory":"/etc"] true +Read .passwd.passwd.pluslines ["+"] +Read .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"] +Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["kdc.suse.cz", "kdc.suse.de"] +Read .etc.sssd_conf.v."domain/default"."krb5_realm" "SUSE.CZ" +Read .etc.sssd_conf.v."domain/default"."krb5_kdcip" nil +Read .etc.sssd_conf.v."domain/default"."ldap_schema" "rfc2307" +Read .etc.sssd_conf.v."domain/default"."cache_credentials" "true" +Read .etc.sssd_conf.v."domain/default"."enumerate" "true" +Return true +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz,kdc.suse.de", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] Added: trunk/ldap-client/testsuite/tests/Export3.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Export3.ycp?rev=66835&view=auto ============================================================================== --- trunk/ldap-client/testsuite/tests/Export3.ycp (added) +++ trunk/ldap-client/testsuite/tests/Export3.ycp Wed Nov 16 15:41:19 2011 @@ -0,0 +1,120 @@ +/** + * Read.ycp + * Test of Ldap:Read function - test more KDC's (bnc#729174) + * Author: Jiri Suchomel + * $Id$ + */ + +{ + + // testedfiles: Ldap.ycp + import "Testsuite"; + + map READ = $[ + "etc": $[ + "nsswitch_conf" : $[ + "passwd" : "sss", + "group" : "sss", + "passwd_compat" : nil, + "group_compat" : nil + ], + "ldap_conf" : $[ + "v" : $[ + "/etc/ldap.conf": $[ + "host" : "localhost", + "base" : "dc=suse,dc=cz", + "nss_base_passwd" : nil, + "nss_base_shadow" : nil, + "nss_base_group" : "ou=group,dc=suse,dc=cz", + "ldap_version": nil, + "ssl": nil, + "pam_password": "crypt", + "tls_cacertdir" : "/etc/openldap/cacerts/", + "tls_cacertfile": nil, + "tls_checkpeer" : nil, + "uri" : nil + ] + ] + ], + "krb5_conf" : $[ + "v" : $[ + "libdefaults": $[ + "default_realm": ["SUSE.CZ"], + ], + "SUSE.CZ": $[ + "kdc": ["kdc.suse.cz", "kdc.suse.de"], + ], + ], + ], + // /etc/security/pam_* + "security": $[ + "section": $[ + "/etc/security/pam_unix2.conf": $[], + ], + "v": $[ + "/etc/security/pam_unix2.conf": $[ + "auth" : "" + ], + ] + ], + "sssd_conf" : $[ + "v" : $[ + "domain/default" : $[ + "krb5_realm" : "SUSE.CZ", + // this ensures kdc is read from krb5.conf + "krb5_kdcip" : nil, + "ldap_schema" : "rfc2307", + "cache_credentials" : "true", + "enumerate" : "true" + ], + ], + ], + ], + "sysconfig": $[ + "ldap": $[ + "BASE_CONFIG_DN": nil, + "BIND_DN": "uid=manager,dc=suse,dc=cz", + "FILE_SERVER": "no" + ] + ], + "init": $[ + "scripts": $[ + "exists": false, + ], + ], + "passwd": $[ + "passwd": $[ + "plusline": "+", + "pluslines": ["+"] + ] + ], + "product" : $[ "features" : + $[ "EVMS_CONFIG" : "nazdar" ], + ], + "target" : $[ + "size" : -1, + "stat" : $[1:2], + ], + ]; + + map EX = $[ + "target": $[ + "bash": 0, + "bash_output": $[ + // for Pam::Enabled ("mkhomedir") call + "stdout" : "something:", + ] + ], + "passwd": $[ + "init": true + ] + ]; + Testsuite::Init ([READ,$[],$[]], nil); + + import "Ldap"; + + Testsuite::Test (``(Ldap::Read ()), [ READ, $[], EX ], 0); + + Testsuite::Test (``(Ldap::Export ()), [ READ, $[], EX ], 0); + +} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org