Hello community, here is the log from the commit of package yast2-kerberos-client for openSUSE:Factory checked in at 2012-10-09 13:58:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-kerberos-client (Old) and /work/SRC/openSUSE:Factory/.yast2-kerberos-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-kerberos-client", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-kerberos-client/yast2-kerberos-client.changes 2012-09-21 14:58:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-kerberos-client.new/yast2-kerberos-client.changes 2012-10-09 14:00:53.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 4 10:14:49 CEST 2012 - [email protected] + +- save Kerberos expert options to sssd.conf as well (bnc#778513) +- 2.23.1 + +------------------------------------------------------------------- Old: ---- yast2-kerberos-client-2.23.0.tar.bz2 New: ---- yast2-kerberos-client-2.23.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-kerberos-client.spec ++++++ --- /var/tmp/diff_new_pack.Alu5HA/_old 2012-10-09 14:00:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Alu5HA/_new 2012-10-09 14:00:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-kerberos-client -Version: 2.23.0 +Version: 2.23.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-kerberos-client-2.23.0.tar.bz2 -> yast2-kerberos-client-2.23.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kerberos-client-2.23.0/VERSION new/yast2-kerberos-client-2.23.1/VERSION --- old/yast2-kerberos-client-2.23.0/VERSION 2012-09-20 15:45:22.000000000 +0200 +++ new/yast2-kerberos-client-2.23.1/VERSION 2012-10-04 10:15:19.000000000 +0200 @@ -1 +1 @@ -2.23.0 +2.23.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kerberos-client-2.23.0/src/Kerberos.ycp new/yast2-kerberos-client-2.23.1/src/Kerberos.ycp --- old/yast2-kerberos-client-2.23.0/src/Kerberos.ycp 2012-09-07 10:06:09.000000000 +0200 +++ new/yast2-kerberos-client-2.23.1/src/Kerberos.ycp 2012-10-04 10:14:03.000000000 +0200 @@ -514,22 +514,35 @@ // fate#308902 if (sssd) { - y2milestone ("not using pam_krb5 because sssd is configured"); - Pam::Remove ("krb5"); + y2milestone ("not using pam_krb5 because sssd is configured"); + Pam::Remove ("krb5"); - y2milestone ("updating sssd.conf with new kerberos values"); + 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); - // divide by commas: krb5_kdcip = kdcserver1, kdcserver2 (bnc#729174) - string krb5_kdcip = mergestring (splitstring (kdc, " "), ","); - SCR::Write (add (domain, "krb5_kdcip"), krb5_kdcip); - if (!SCR::Write(.etc.sssd_conf, nil)) - { - y2error ("error writing ldap.conf file"); - } + 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); + // divide by commas: krb5_kdcip = kdcserver1, kdcserver2 (bnc#729174) + string krb5_kdcip = mergestring (splitstring (kdc, " "), ","); + SCR::Write (add (domain, "krb5_kdcip"), krb5_kdcip); + + // write expert settings (bnc#778513) + SCR::Write (add (domain, "krb5_ccachedir"), + ExpertSettings["ccache_dir"]:"" == "" ? nil : ExpertSettings["ccache_dir"]:""); + SCR::Write (add (domain, "ccname_template"), + ExpertSettings["ccname_template"]:"" == "" ? nil : ExpertSettings["ccname_template"]:""); + SCR::Write (add (domain, "krb5_validate"), + ExpertSettings["validate"]:"" == "true" ? "True" : "False"); + SCR::Write (add (domain, "krb5_keytab"), + ExpertSettings["keytab"]:"" == "" ? nil : ExpertSettings["keytab"]:""); + SCR::Write (add (domain, "krb5_renewable_lifetime"), renew_lifetime); + SCR::Write (add (domain, "krb5_lifetime"), ticket_lifetime); + + if (!SCR::Write(.etc.sssd_conf, nil)) + { + y2error ("error writing ldap.conf file"); + } } else if (use_pam_krb) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
