Hello community, here is the log from the commit of package yast2-kerberos-client for openSUSE:Factory checked in at Tue Jan 25 10:31:06 CET 2011. -------- --- yast2-kerberos-client/yast2-kerberos-client.changes 2011-01-21 12:36:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-kerberos-client/yast2-kerberos-client.changes 2011-01-24 16:22:29.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 24 16:18:57 CET 2011 - jsuchome@suse.cz + +- do not install pam_krb5 if sssd is configured (bnc#666186) +- 2.20.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-kerberos-client-2.20.2.tar.bz2 New: ---- yast2-kerberos-client-2.20.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-kerberos-client.spec ++++++ --- /var/tmp/diff_new_pack.XXW1NF/_old 2011-01-25 10:30:49.000000000 +0100 +++ /var/tmp/diff_new_pack.XXW1NF/_new 2011-01-25 10:30:49.000000000 +0100 @@ -19,11 +19,11 @@ Name: yast2-kerberos-client -Version: 2.20.2 +Version: 2.20.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-kerberos-client-2.20.2.tar.bz2 +Source0: yast2-kerberos-client-2.20.3.tar.bz2 Prefix: /usr @@ -46,7 +46,7 @@ Kerberos server will be used for user authentication. %prep -%setup -n yast2-kerberos-client-2.20.2 +%setup -n yast2-kerberos-client-2.20.3 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-kerberos-client-2.20.2.tar.bz2 -> yast2-kerberos-client-2.20.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kerberos-client-2.20.2/VERSION new/yast2-kerberos-client-2.20.3/VERSION --- old/yast2-kerberos-client-2.20.2/VERSION 2011-01-21 12:35:44.000000000 +0100 +++ new/yast2-kerberos-client-2.20.3/VERSION 2011-01-24 16:19:35.000000000 +0100 @@ -1 +1 @@ -2.20.2 +2.20.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kerberos-client-2.20.2/src/Kerberos.ycp new/yast2-kerberos-client-2.20.3/src/Kerberos.ycp --- old/yast2-kerberos-client-2.20.2/src/Kerberos.ycp 2011-01-21 12:26:43.000000000 +0100 +++ new/yast2-kerberos-client-2.20.3/src/Kerberos.ycp 2011-01-24 16:20:55.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Data for configuration of kerberos-client, i/o functions. * Authors: Jiri Suchomel <jsuchome@suse.cz> * - * $Id: Kerberos.ycp 63239 2011-01-20 15:13:34Z jsuchome $ + * $Id: Kerberos.ycp 63252 2011-01-21 12:03:18Z jsuchome $ * * Representation of the configuration of kerberos-client. * Input and output routines. @@ -728,12 +728,27 @@ } /** + * Return the list of packages for kerberos configuration + */ +global list<string> RequiredPackages () { + + list<string> packages = required_packages; + // do not install pam_krb5 if sssd is configured + if (Pam::Enabled ("sss")) + { + packages = filter (string p, packages, ``(p != "pam_krb5")); + } + return packages; +} + + +/** * Return required packages for auto-installation * @return map of packages to be installed and to be removed */ global define map AutoPackages() { return ($[ - "install": required_packages, + "install": RequiredPackages (), "remove": [] ]); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kerberos-client-2.20.2/src/dialogs.ycp new/yast2-kerberos-client-2.20.3/src/dialogs.ycp --- old/yast2-kerberos-client-2.20.2/src/dialogs.ycp 2010-01-28 16:11:28.000000000 +0100 +++ new/yast2-kerberos-client-2.20.3/src/dialogs.ycp 2011-01-24 16:16:58.000000000 +0100 @@ -383,7 +383,7 @@ } if (result == `next && use_pam_krb) { - if (!Package::InstallAll (Kerberos::required_packages)) + if (!Package::InstallAll (Kerberos::RequiredPackages ())) { result = `not_next; use_pam_krb = false; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org