Author: jsuchome Date: Wed Jul 27 16:19:35 2011 New Revision: 65047 URL: http://svn.opensuse.org/viewcvs/yast?rev=65047&view=rev Log: - check for 'sss' in nsswitch.conf for LDAP users, added test (bnc#708565, bnc#683782) - 2.17.48 Added: branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/ReadLDAPAvailable.err branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/ReadLDAPAvailable.out branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/ReadLDAPAvailable.ycp (with props) Modified: branches/SuSE-Code-11-SP2-Branch/users/VERSION branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes branches/SuSE-Code-11-SP2-Branch/users/src/UsersLDAP.pm Modified: branches/SuSE-Code-11-SP2-Branch/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users/... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/users/VERSION Wed Jul 27 16:19:35 2011 @@ -1 +1 @@ -2.17.47 +2.17.48 Modified: branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users/... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/users/package/yast2-users.changes Wed Jul 27 16:19:35 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 27 11:32:42 CEST 2011 - jsuchome@suse.cz + +- check for 'sss' in nsswitch.conf for LDAP users, added test + (bnc#708565, bnc#683782) +- 2.17.48 + +------------------------------------------------------------------- Fri Jul 15 12:40:56 CEST 2011 - jsuchome@suse.cz - fixed typos (bnc#703227) Modified: branches/SuSE-Code-11-SP2-Branch/users/src/UsersLDAP.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users/... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/src/UsersLDAP.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/users/src/UsersLDAP.pm Wed Jul 27 16:19:35 2011 @@ -173,7 +173,7 @@ my $passwd_source = SCR->Read (".etc.nsswitch_conf.passwd"); if (defined $passwd_source) { foreach my $source (split (/ /, $passwd_source)) { - if ($source eq "ldap") { return 1; } + if ($source eq "ldap" || $source eq "sss") { return 1; } if ($source eq "compat") { $compat = 1; } } } Added: branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/ReadLDAPAvailable.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users/... ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/ReadLDAPAvailable.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users/... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/ReadLDAPAvailable.out (added) +++ branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/ReadLDAPAvailable.out Wed Jul 27 16:19:35 2011 @@ -0,0 +1,6 @@ +Read .etc.nsswitch_conf.passwd "ldap files" +Return true +Read .etc.nsswitch_conf.passwd "files" +Return false +Read .etc.nsswitch_conf.passwd "sss" +Return true Added: branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/ReadLDAPAvailable.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/users/... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/ReadLDAPAvailable.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/users/testsuite/tests/ReadLDAPAvailable.ycp Wed Jul 27 16:19:35 2011 @@ -0,0 +1,32 @@ +/** + * File : ReadLDAPAvailable.ycp + * Module : Users configurator + * Summary : Test of UsersLDAP::ReadAvailable + * Authors : Jiri Suchomel <jsuchome@suse.cz> + */ + +{ + // testedfiles: UsersLDAP.pm + + map READ = $[ + "etc" : $[ + "nsswitch_conf" : $[ + "passwd" : "ldap files" + ], + ], + ]; + + import "Testsuite"; + import "UsersLDAP"; + + Testsuite::Test (``(UsersLDAP::ReadAvailable ()), [READ, $[], $[]], 0); + + READ["etc","nsswitch_conf","passwd"] = "files"; + + Testsuite::Test (``(UsersLDAP::ReadAvailable ()), [READ, $[], $[]], 0); + + READ["etc","nsswitch_conf","passwd"] = "sss"; + + Testsuite::Test (``(UsersLDAP::ReadAvailable ()), [READ, $[], $[]], 0); + +} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org