Author: jsuchome Date: Mon Jan 24 16:21:24 2011 New Revision: 63261 URL: http://svn.opensuse.org/viewcvs/yast?rev=63261&view=rev Log: - do not install pam_krb5 if sssd is configured (bnc#666186) - 2.20.3 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 Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=63261&r1=63260&r2=63261&view=diff ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Mon Jan 24 16:21:24 2011 @@ -1 +1 @@ -2.20.2 +2.20.3 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=63261&r1=63260&r2=63261&view=diff ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Mon Jan 24 16:21:24 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +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 + +------------------------------------------------------------------- Fri Jan 21 12:26:47 CET 2011 - jsuchome@suse.cz - when sssd is configured, update sssd.conf's kerberos values Modified: trunk/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/Kerberos.ycp?rev=63261&r1=63260&r2=63261&view=diff ============================================================================== --- trunk/kerberos-client/src/Kerberos.ycp (original) +++ trunk/kerberos-client/src/Kerberos.ycp Mon Jan 24 16:21:24 2011 @@ -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": [] ]); } Modified: trunk/kerberos-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/dialogs.ycp?rev=63261&r1=63260&r2=63261&view=diff ============================================================================== --- trunk/kerberos-client/src/dialogs.ycp (original) +++ trunk/kerberos-client/src/dialogs.ycp Mon Jan 24 16:21:24 2011 @@ -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; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org