comps-f14.xml.in

[Nalin Dahyabhai]

 comps-f14.xml.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e3348627b07f3ba5f341ed03a2f1e640ef4c681b
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Thu Jun 24 16:54:03 2010 -0400

    - change nss-pam-ldapd and pam_ldap from "default" to "optional"
      We install sssd by default, and authconfig prefers to use sssd if it's
      available, so we don't lose anything by this.  It should also lessen
      the chances of file collisions of the type reported in #604978.

diff --git a/comps-f14.xml.in b/comps-f14.xml.in
index 1f1d20f..4837827 100644
--- a/comps-f14.xml.in
+++ b/comps-f14.xml.in
@@ -274,7 +274,6 @@
       <packagereq type="default">nc</packagereq>
       <packagereq type="default">nfs-utils</packagereq>
       <packagereq type="default">nss_db</packagereq>
-      <packagereq type="default">nss-pam-ldapd</packagereq>
       <packagereq type="default">ntfs-3g</packagereq>
       <packagereq type="default">ntfsprogs</packagereq>
       <packagereq type="default">numactl</packagereq>
@@ -282,7 +281,6 @@
       <packagereq type="default">PackageKit-yum-plugin</packagereq>
       <packagereq type="default">pam_ccreds</packagereq>
       <packagereq type="default">pam_krb5</packagereq>
-      <packagereq type="default">pam_ldap</packagereq>
       <packagereq type="default">pam_passwdqc</packagereq>
       <packagereq type="default">pam_pkcs11</packagereq>
       <packagereq type="default">pam_smb</packagereq>
@@ -347,6 +345,8 @@
       <packagereq type="optional">mgetty</packagereq>
       <packagereq type="optional">mkbootdisk</packagereq>
       <packagereq type="optional">mtools</packagereq>
+      <packagereq type="optional">nss-pam-ldapd</packagereq>
+      <packagereq type="optional">pam_ldap</packagereq>
       <packagereq type="optional">pax</packagereq>
       <packagereq type="optional">redhat-lsb</packagereq>
       <packagereq type="optional">reiserfs-utils</packagereq>