Use new config location on RHEL 6

https://sourceforge.net/tracker/?func=detail&atid=117457&aid=3171578&group_id=17457

diff --git a/ldap-server/config-Redhat-Enterprise-Linux-6.0-* b/ldap-server/config-Redhat-Enterprise-Linux-6.0-*
new file mode 100644 (file)
index 0000000..960d29b
--- /dev/null
+++ b/ldap-server/config-Redhat-Enterprise-Linux-6.0-*
@@ -0,0 +1,10 @@
+config_file=/etc/openldap/slapd.d
+schema_dir=/etc/openldap/schema
+slapd=slapd
+ldap_user=ldap
+browse_max=100
+start_cmd=/etc/init.d/ldap start
+stop_cmd=/etc/init.d/ldap stop
+apply_cmd=/etc/init.d/ldap restart
+init_name=ldap
+data_dir=/var/lib/ldap

diff --git a/ldap-server/config-Scientific-Linux-6.0-* b/ldap-server/config-Scientific-Linux-6.0-*
new file mode 100644 (file)
index 0000000..960d29b
--- /dev/null
+++ b/ldap-server/config-Scientific-Linux-6.0-*
@@ -0,0 +1,10 @@
+config_file=/etc/openldap/slapd.d
+schema_dir=/etc/openldap/schema
+slapd=slapd
+ldap_user=ldap
+browse_max=100
+start_cmd=/etc/init.d/ldap start
+stop_cmd=/etc/init.d/ldap stop
+apply_cmd=/etc/init.d/ldap restart
+init_name=ldap
+data_dir=/var/lib/ldap

diff --git a/ldap-server/ldap-server-lib.pl b/ldap-server/ldap-server-lib.pl
index 9fa9c13..153356b 100755 (executable)
--- a/ldap-server/ldap-server-lib.pl
+++ b/ldap-server/ldap-server-lib.pl
@@ -100,7 +100,15 @@ return $ldap;
 # For LDIF format configs, returns the config DN for the default database
 sub get_default_db
 {
-return "olcDatabase={1}hdb,cn=config";
+local @poss = ( "olcDatabase={1}bdb,cn=config",
+               "olcDatabase={1}hdb,cn=config" );
+foreach my $p (@poss) {
+       local @w = split(/,/, $p);
+       if (-r $config{'config_file'}."/".join("/", reverse(@w)).".ldif") {
+               return $p;
+               }
+       }
+return $poss[$#poss];
 }
 
 sub get_config_db