From 7d5c7ef5f733d3077e430fe80b17933bb8618ef4 Mon Sep 17 00:00:00 2001
From: Jeff Tickle <ticklejw@appstate.edu>
Date: Wed, 13 Aug 2014 14:00:18 -0400
Subject: [PATCH 1/3] Added support for "scope" variable in ldap.conf, which
 tells it how deep to search

---
 manifests/client.pp                  | 1 +
 templates/etc/openldap/ldap.conf.erb | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/manifests/client.pp b/manifests/client.pp
index 609c537..c66aa50 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -177,6 +177,7 @@
   $bindpw         = false,
   $ssl            = false,
   $ssl_cert       = false,
+  $search_scope   = false,
 
   $nsswitch   = false,
   $nss_passwd = false,
diff --git a/templates/etc/openldap/ldap.conf.erb b/templates/etc/openldap/ldap.conf.erb
index 62021be..1b4cdae 100644
--- a/templates/etc/openldap/ldap.conf.erb
+++ b/templates/etc/openldap/ldap.conf.erb
@@ -39,6 +39,10 @@ pam_password         <%= @pam_passwd %>
 pam_filter           <%= @pam_filter %>
 <% end -%>
 
+<% if @search_scope != false then -%>
+scope <%= @search_scope %>
+<% end -%>
+
 <% if @sudoers_base != false -%>
 sudoers_base          <%= @sudoers_base %>,<%= @base %>
 sudoers_search_filter <%= @sudoers_filter %>

From 55c5ee3ca4dbfeefea96387baadeb95dbeb19203 Mon Sep 17 00:00:00 2001
From: Jeff Tickle <ticklejw@appstate.edu>
Date: Wed, 13 Aug 2014 14:05:17 -0400
Subject: [PATCH 2/3] Changed operatingsystem to osfamily, seems to be the
 better choice in this case.  Was breaking on CentOS before.

---
 manifests/client.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index c66aa50..2e92d94 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -231,7 +231,7 @@
   }
 
   # Configurations based on operating system release
-  include "ldap::os::${::operatingsystem}"
+  include "ldap::os::${::osclass}"
 
   if($ssl) {
 

From c763a9572ab6a76447cbf49a0df70589dbcf7f5a Mon Sep 17 00:00:00 2001
From: Jeff Tickle <ticklejw@appstate.edu>
Date: Wed, 13 Aug 2014 14:09:18 -0400
Subject: [PATCH 3/3] And class should have been family there

---
 manifests/client.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index 2e92d94..2d4714c 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -231,7 +231,7 @@
   }
 
   # Configurations based on operating system release
-  include "ldap::os::${::osclass}"
+  include "ldap::os::${::osfamily}"
 
   if($ssl) {