Author: jsuchome Date: Fri Jan 21 13:03:18 2011 New Revision: 63252 URL: http://svn.opensuse.org/viewcvs/yast?rev=63252&view=rev Log: - when sssd is configured, update sssd.conf's kerberos values - agent for krb5.conf moved to yast2-pam to be usable by ldap-client - 2.20.2 Removed: trunk/kerberos-client/agents/etc_krb5_conf.scr Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/Kerberos.ycp trunk/kerberos-client/yast2-kerberos-client.spec.in Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=63252&r1=63251&r2=63252&view=diff ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Fri Jan 21 13:03:18 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 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=63252&r1=63251&r2=63252&view=diff ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Fri Jan 21 13:03:18 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 21 12:26:47 CET 2011 - jsuchome@suse.cz + +- when sssd is configured, update sssd.conf's kerberos values +- agent for krb5.conf moved to yast2-pam to be usable by ldap-client +- 2.20.2 + +------------------------------------------------------------------- Thu Jan 20 16:12:22 CET 2011 - jsuchome@suse.cz - do not use pam_krb5 when sssd is configured Modified: trunk/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/Kerberos.ycp?rev=63252&r1=63251&r2=63252&view=diff ============================================================================== --- trunk/kerberos-client/src/Kerberos.ycp (original) +++ trunk/kerberos-client/src/Kerberos.ycp Fri Jan 21 13:03:18 2011 @@ -482,10 +482,24 @@ // -- pam settings if (pam_modified || write_only) { + // whem sssd is configured, do not use pam_krb5 and update sssd.conf + // fate#308902 if (Pam::Enabled ("sss")) { y2milestone ("not using pam_krb5 because sssd is configured"); Pam::Remove ("krb5"); + + y2milestone ("updating sssd.conf with new kerberos values"); + + path domain = add (.etc.sssd_conf.v, "domain/default"); + SCR::Write (add (domain, "auth_provider"), "krb5"); + SCR::Write (add (domain, "chpass_provider"), "krb5"); + SCR::Write (add (domain, "krb5_realm"), default_realm); + SCR::Write (add (domain, "krb5_kdcip"), kdc); + if (!SCR::Write(.etc.sssd_conf, nil)) + { + y2error ("error writing ldap.conf file"); + } } else if (use_pam_krb) { Modified: trunk/kerberos-client/yast2-kerberos-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/yast2-kerberos-client.spec.in?rev=63252&r1=63251&r2=63252&view=diff ============================================================================== --- trunk/kerberos-client/yast2-kerberos-client.spec.in (original) +++ trunk/kerberos-client/yast2-kerberos-client.spec.in Fri Jan 21 13:03:18 2011 @@ -5,8 +5,8 @@ License: GPL v2 or later BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-pam yast2-testsuite -# new Pam.ycp API -Requires: yast2-pam >= 2.14.0 +# etc_krb5_conf.scr +Requires: yast2-pam >= 2.20.0 # Hostname::CurrentDomain, CurrentHostname Requires: yast2 >= 2.16.48 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org