From 917ea4c93d06bf716e6c105fc4c1db7fbd39ba88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Tue, 17 Sep 2013 15:37:01 +0300
Subject: [PATCH] ldap: Fixed ldap::auth when running from Fedora 19 kickstart.

---
 ldap/manifests/init.pp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ldap/manifests/init.pp b/ldap/manifests/init.pp
index a59883a..23be41d 100644
--- a/ldap/manifests/init.pp
+++ b/ldap/manifests/init.pp
@@ -98,18 +98,7 @@ class ldap::auth inherits ldap::client {
             package { "sssd":
                 ensure => installed,
             }
-            if $::operatingsystemrelease < 19 {
-                package { "pam_ldap":
-                    ensure => installed,
-                    before => Package["sssd"],
-                }
-                exec { "authconfig --enableldap --enableldapauth --ldapserver='${ldap_uri}' --ldapbasedn='${ldap_basedn}' --enablesssd --krb5realm='' --update":
-                    path    => "/bin:/usr/bin:/sbin:/usr/sbin",
-                    unless  => 'cat /etc/sysconfig/authconfig | egrep "^USELDAPAUTH=yes$|^USELDAP=yes$" | wc -l | egrep "^2$"',
-                    before  => Augeas["sssd-conf"],
-                    require => [ Package["authconfig"], Package["sssd"], ],
-                }
-            } else {
+            if versioncmp($::operatingsystemrelease, "18") == 1 {
                 exec { "authconfig --enableldap --enableldapauth --ldapserver='${ldap_uri}' --ldapbasedn='${ldap_basedn}' --krb5realm='' --update":
                     path    => "/bin:/usr/bin:/sbin:/usr/sbin",
                     creates => "/etc/sssd/sssd.conf",
@@ -121,6 +110,17 @@ class ldap::auth inherits ldap::client {
                     refreshonly => true,
                     before      => Augeas["sssd-conf"],
                 }
+            } else {
+                package { "pam_ldap":
+                    ensure => installed,
+                    before => Package["sssd"],
+                }
+                exec { "authconfig --enableldap --enableldapauth --ldapserver='${ldap_uri}' --ldapbasedn='${ldap_basedn}' --enablesssd --krb5realm='' --update":
+                    path    => "/bin:/usr/bin:/sbin:/usr/sbin",
+                    unless  => 'cat /etc/sysconfig/authconfig | egrep "^USELDAPAUTH=yes$|^USELDAP=yes$" | wc -l | egrep "^2$"',
+                    before  => Augeas["sssd-conf"],
+                    require => [ Package["authconfig"], Package["sssd"], ],
+                }
             }
             augeas { "sssd-conf":
                 changes => [