Author: jsuchome Date: Wed Jul 27 16:19:10 2011 New Revision: 65044 URL: http://svn.opensuse.org/viewcvs/yast?rev=65044&view=rev Log: - correctly set sssd value during Read (bnc#708562) - 2.17.30 Added: branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.err branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.out branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.ycp (with props) 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=65044&r1=65043&r2=65044&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION Wed Jul 27 16:19:10 2011 @@ -1 +1 @@ -2.17.29 +2.17.30 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=65044&r1=65043&r2=65044&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 Jul 27 16:19:10 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 27 13:59:53 CEST 2011 - jsuchome@suse.cz + +- correctly set sssd value during Read (bnc#708562) +- 2.17.30 + +------------------------------------------------------------------- Fri Jul 15 11:54:18 CEST 2011 - jsuchome@suse.cz - correctly realize that SSSD was selected (bnc#705118) 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=65044&r1=65043&r2=65044&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 Jul 27 16:19:10 2011 @@ -802,7 +802,8 @@ else { // ... or as 'sssd' - start = contains (nsswitch["passwd"]:[], "sss"); + sssd = contains (nsswitch["passwd"]:[], "sss"); + start = sssd; } old_start = start; Added: branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.err?rev=65044&view=auto ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.out?rev=65044&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.out (added) +++ branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.out Wed Jul 27 16:19:10 2011 @@ -0,0 +1,25 @@ +Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" "ldap://localhost:333" +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" "no" +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" nil +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.sssd_conf.v."domain/default"."krb5_realm" "SUSE.CZ" +Read .etc.sssd_conf.v."domain/default"."krb5_kdcip" "kdc.suse.cz" +Read .etc.sssd_conf.v."domain/default"."ldap_schema" nil +Read .etc.sssd_conf.v."domain/default"."cache_credentials" "True" +Read .etc.sssd_conf.v."domain/default"."enumerate" nil +Return true +Dump ldap: -true- +Dump sssd: -true- Added: branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.ycp?rev=65044&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/ldap-client/testsuite/tests/Read2.ycp Wed Jul 27 16:19:10 2011 @@ -0,0 +1,120 @@ +/** + * Read.ycp + * Test of Ldap:Read function + * Author: Jiri Suchomel + * $Id$ + */ + +{ + // testedfiles: Ldap.ycp + + import "Ldap"; + 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" : nil, + "ldap_version": nil, + "ssl": nil, + "pam_password": "crypt", + "tls_cacertdir" : "/etc/openldap/cacerts/", + "tls_cacertfile": nil, + "tls_checkpeer" : "no", + "uri" : "ldap://localhost:333" + ] + ] + ], + "krb5_conf" : $[ + "v" : $[ + "libdefaults": $[ + "default_realm": ["SUSE.CZ"], + ], + "SUSE.CZ": $[ + "kdc": ["kdc.suse.cz"], + ], + ], + ], + // /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", + "krb5_kdcip" : "kdc.suse.cz", + "ldap_schema" : nil, + "cache_credentials" : "True", + "enumerate" : nil + ], + ], + ], + ], + "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": $[ + "stdout" : "", + ] + ], + "passwd": $[ + "init": true + ] + ]; + + Testsuite::Init ([READ,$[],$[]], nil); + + Testsuite::Test (``(Ldap::Read ()), [ READ, $[], EX ], 0); + + Testsuite::Dump ( sformat ("ldap: -%1-", Ldap::start) ); + + Testsuite::Dump ( sformat ("sssd: -%1-", Ldap::sssd) ); + +} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org