[yast-commit] r63239 - in /trunk/kerberos-client: VERSION package/yast2-kerberos-client.changes src/Kerberos.ycp testsuite/tests/Write.out
Author: jsuchome Date: Thu Jan 20 16:13:34 2011 New Revision: 63239 URL: http://svn.opensuse.org/viewcvs/yast?rev=63239&view=rev Log: - do not use pam_krb5 when sssd is configured - 2.20.1 Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/Kerberos.ycp trunk/kerberos-client/testsuite/tests/Write.out Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=63239&r1=63238&r2=63239&view=diff ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Thu Jan 20 16:13:34 2011 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-kerberos-client.changes?rev=63239&r1=63238&r2=63239&view=diff ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Thu Jan 20 16:13:34 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 20 16:12:22 CET 2011 - jsuchome@suse.cz + +- do not use pam_krb5 when sssd is configured +- 2.20.1 + +------------------------------------------------------------------- Fri Aug 6 11:05:12 CEST 2010 - jsuchome@suse.cz - testsuite adapted to changes in yast2-pam Modified: trunk/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/Kerberos.ycp?rev=63239&r1=63238&r2=63239&view=diff ============================================================================== --- trunk/kerberos-client/src/Kerberos.ycp (original) +++ trunk/kerberos-client/src/Kerberos.ycp Thu Jan 20 16:13:34 2011 @@ -482,7 +482,12 @@ // -- pam settings if (pam_modified || write_only) { - if (use_pam_krb) + if (Pam::Enabled ("sss")) + { + y2milestone ("not using pam_krb5 because sssd is configured"); + Pam::Remove ("krb5"); + } + else if (use_pam_krb) { Pam::Add ("krb5"); // If ldap is configured we need to change it to ldap-account_only Modified: trunk/kerberos-client/testsuite/tests/Write.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/testsuite/tests/Write.out?rev=63239&r1=63238&r2=63239&view=diff ============================================================================== --- trunk/kerberos-client/testsuite/tests/Write.out (original) +++ trunk/kerberos-client/testsuite/tests/Write.out Thu Jan 20 16:13:34 2011 @@ -1,6 +1,7 @@ Dump ==== writing without any changes ================================= Return true Dump ==== pam enabled with krb5-ignore_unknown_principals= +Execute .target.bash_output "/usr/sbin/pam-config -q --sss" $["stdout":""] Execute .target.bash_output "/usr/sbin/pam-config -a --krb5" $["stdout":""] Execute .target.bash_output "/usr/sbin/pam-config -q --ldap" $["stdout":""] Execute .target.bash_output "/usr/sbin/pam-config -a --krb5-ignore_unknown_principals" $["stdout":""] @@ -11,6 +12,7 @@ Write .etc.ssh.ssh_config nil true Return true Dump ==== kerberos disabled, ssh support disabled, krb5.conf untouched= +Execute .target.bash_output "/usr/sbin/pam-config -q --sss" $["stdout":""] Execute .target.bash_output "/usr/sbin/pam-config -q --ldap-account_only" $["stdout":""] Execute .target.bash_output "/usr/sbin/pam-config -d --krb5" $["stdout":""] Write .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "no" true -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
jsuchome@svn2.opensuse.org