Author: jsuchome Date: Wed Mar 16 14:52:35 2011 New Revision: 63577 URL: http://svn.opensuse.org/viewcvs/yast?rev=63577&view=rev Log: - show an info that sssd is configured (fate#308902) - 2.21.0 Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/Kerberos.ycp trunk/kerberos-client/src/dialogs.ycp trunk/kerberos-client/src/kerberos.rnc trunk/kerberos-client/testsuite/tests/Read.out trunk/kerberos-client/testsuite/tests/Write.out Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=63577&r1=63576&r2=63577&view=diff ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Wed Mar 16 14:52:35 2011 @@ -1 +1 @@ -2.20.3 +2.21.0 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=63577&r1=63576&r2=63577&view=diff ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Wed Mar 16 14:52:35 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 16 14:51:12 CET 2011 - jsuchome@suse.cz + +- show an info that sssd is configured (fate#308902) +- 2.21.0 + +------------------------------------------------------------------- Mon Jan 24 16:18:57 CET 2011 - jsuchome@suse.cz - do not install pam_krb5 if sssd is configured (bnc#666186) Modified: trunk/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/Kerberos.ycp?rev=63577&r1=63576&r2=63577&view=diff ============================================================================== --- trunk/kerberos-client/src/Kerberos.ycp (original) +++ trunk/kerberos-client/src/Kerberos.ycp Wed Mar 16 14:52:35 2011 @@ -90,6 +90,9 @@ // if DNS is used for retrieving configuration data global boolean dns_used = false; +// if sssd is configured, do not use pam_krb5 +global boolean sssd = false; + /** map with the settings configurable in the expert tabs */ @@ -134,6 +137,8 @@ ExpertSettings = client["ExpertSettings"]:$[]; if (!haskey (ExpertSettings, "use_shmem") && haskey (client, "use_shmem")) ExpertSettings["use_shmem"] = use_shmem; + + sssd = settings["sssd"]:sssd; pam_modified = true; modified = true; ssh_modified = true; @@ -150,6 +155,7 @@ map export_map = $[ "pam_login": $[ "use_kerberos" : use_pam_krb, + "sssd" : sssd, ], "kerberos_client": $[ "default_domain" : default_domain, @@ -415,6 +421,8 @@ if (ssh_support == nil) ssh_support = false; + sssd = Pam::Enabled ("sss"); + return true; } @@ -484,7 +492,7 @@ { // whem sssd is configured, do not use pam_krb5 and update sssd.conf // fate#308902 - if (Pam::Enabled ("sss")) + if (sssd) { y2milestone ("not using pam_krb5 because sssd is configured"); Pam::Remove ("krb5"); @@ -734,7 +742,7 @@ list<string> packages = required_packages; // do not install pam_krb5 if sssd is configured - if (Pam::Enabled ("sss")) + if (sssd) { packages = filter (string p, packages, ``(p != "pam_krb5")); } Modified: trunk/kerberos-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/dialogs.ycp?rev=63577&r1=63576&r2=63577&view=diff ============================================================================== --- trunk/kerberos-client/src/dialogs.ycp (original) +++ trunk/kerberos-client/src/dialogs.ycp Wed Mar 16 14:52:35 2011 @@ -392,6 +392,14 @@ UI::ChangeWidget (`id (widget), `Enabled, use_pam_krb); }); } + if (Kerberos::sssd) + { + // popup message + Popup::Message ("System Security Services Daemon (SSSD) is configured. +It is in use for Kerberos authentication instead of pam_krb5. + +You can disable SSSD in yast2 ldap-client module."); + } } } while (!contains ([`back, `cancel, `abort, `next, `advanced], result)); Modified: trunk/kerberos-client/src/kerberos.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/kerberos.rnc?rev=63577&r1=63576&r2=63577&view=diff ============================================================================== --- trunk/kerberos-client/src/kerberos.rnc (original) +++ trunk/kerberos-client/src/kerberos.rnc Wed Mar 16 14:52:35 2011 @@ -9,7 +9,8 @@ pam_login = element pam_login { - element use_kerberos { BOOLEAN }? + element use_kerberos { BOOLEAN }? & + element sssd { BOOLEAN }? } kerberos_client = element kerberos_client { Modified: trunk/kerberos-client/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/testsuite/tests/Read.out?rev=63577&r1=63576&r2=63577&view=diff ============================================================================== --- trunk/kerberos-client/testsuite/tests/Read.out (original) +++ trunk/kerberos-client/testsuite/tests/Read.out Wed Mar 16 14:52:35 2011 @@ -31,6 +31,7 @@ Dir .etc.ssh.ssh_config.v."*": ["GSSAPIAuthentication", "GSSAPIDelegateCredentials"] Read .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "yes" Read .etc.ssh.ssh_config.v."*"."GSSAPIDelegateCredentials" "yes" +Execute .target.bash_output "/usr/sbin/pam-config -q --sss" $["stdout":"password: "] Return true Dump ============================================ Dump kerberos used: true @@ -47,6 +48,7 @@ Dir .etc.ssh.ssh_config.v."*": ["GSSAPIAuthentication", "GSSAPIDelegateCredentials"] Read .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "yes" Read .etc.ssh.ssh_config.v."*"."GSSAPIDelegateCredentials" "yes" +Execute .target.bash_output "/usr/sbin/pam-config -q --sss" $["stdout":"password: "] Return true Dump default realm: SUSE.CZ Dump ============================================ Modified: trunk/kerberos-client/testsuite/tests/Write.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/testsuite/tests/Write.out?rev=63577&r1=63576&r2=63577&view=diff ============================================================================== --- trunk/kerberos-client/testsuite/tests/Write.out (original) +++ trunk/kerberos-client/testsuite/tests/Write.out Wed Mar 16 14:52:35 2011 @@ -1,7 +1,6 @@ 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":""] @@ -12,7 +11,6 @@ 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