--- openldap.recipe /conary.rpath.com@rpl:devel/2.3.20-2
+++ openldap.recipe @NEW@
@@ -7,7 +7,7 @@

 class Openldap(CPackageRecipe):
     name = 'openldap'
-    version = '2.3.20'
+    version = '2.3.24'

     buildRequires = [ 'gdbm:devel', 'krb5:devel',
                       'openssl:devel', 'pam:devel', 'perl:runtime',
@@ -59,7 +59,7 @@
             ' --enable-local --enable-cldap --with-tls'
             ' --enable-wrappers --enable-crypt --disable-sql --without-ldapd'
             ' --with-threads=posix'
-            ' --localstatedir=%(localstatedir)s/run'
+            ' --localstatedir=%(localstatedir)s'
             ' --enable-static --enable-shared')

         if Use.sasl:
@@ -74,16 +74,20 @@

         r.MakeInstall('LIBTOOL=%(bindir)s/libtool')

-        r.Replace('%(localstatedir)s/run/openldap-data', '%(localstatedir)s/%(lib)s/ldap', '%(sysconfdir)s/openldap/slapd.conf')
+        r.Replace('%(localstatedir)s/openldap-data', '%(servicedir)s/%(lib)s/ldap', '%(sysconfdir)s/openldap/slapd.conf')
+        r.Replace('%(localstatedir)s/run/', '%(localstatedir)s/run/slapd/', '%(sysconfdir)s/openldap/slapd.conf')
         r.SetModes('%(sysconfdir)s/openldap/slapd.conf', 0600)
+        r.MakeDirs('%(localstatedir)s/run/slapd', mode=02770)
+        r.Ownership('root', 'ldap', '%(localstatedir)s/run/slapd')
+        r.ExcludeDirectories(exceptions=['%(localstatedir)s/run/slapd', '%(localstatedir)s/openldap-slurp'] )
         r.Ownership('ldap', 'ldap', '%(sysconfdir)s/openldap/slapd.conf')
-        r.SetModes('%(sysconfdir)s/openldap/ldap.conf', 0600)
         r.Ownership('ldap', 'ldap', '%(sysconfdir)s/openldap/ldap.conf')

-        r.MakeDirs('%(localstatedir)s/%(lib)s/ldap')
-        r.SetModes('%(localstatedir)s/%(lib)s/ldap', 0700,
-                   component='openldap-servers:runtime')
-        r.Ownership('ldap', 'ldap', '%(localstatedir)s/%(lib)s/ldap')
+        #This is the data directory
+        r.Move('%(localstatedir)s/openldap-data', '%(servicedir)s/%(lib)s/ldap')
+        r.SetModes('%(servicedir)s/%(lib)s/ldap', 0700,
+                   component='openldap-servers:data')
+        r.Ownership('ldap', 'ldap', '%(servicedir)s/%(lib)s/ldap')

         r.Remove('%(libexecdir)s/openldap/*.a')

@@ -101,7 +105,8 @@
                       '%(datadir)s/openldap/*.help',
                       '%(datadir)s/openldap/migration/README.*',
                       '%(datadir)s/openldap/migration/.*\.(ph|pl|sh|txt)',
-                      '%(localstatedir)s/%(lib)s/ldap')
+                      '%(localstatedir)s/run/slapd/',
+                      '%(servicedir)s/lib/ldap')

         r.Requires('%(essentialsbindir)s/runuser', '%(initdir)s/ldap')