Fix un-locking of files

diff --git a/ldap-server/config-debian-linux b/ldap-server/config-debian-linux-*-5.9
similarity index 100%
rename from ldap-server/config-debian-linux
rename to ldap-server/config-debian-linux-*-5.9

diff --git a/ldap-server/config-debian-linux-6.0-* b/ldap-server/config-debian-linux-6.0-*
new file mode 100644 (file)
index 0000000..d39b56a
--- /dev/null
+++ b/ldap-server/config-debian-linux-6.0-*
@@ -0,0 +1,9 @@
+config_file=/etc/ldap/slapd.d
+schema_dir=/etc/ldap/schema
+slapd=slapd
+ldap_user=ldap
+browse_max=100
+start_cmd=/etc/init.d/slapd start
+stop_cmd=/etc/init.d/slapd stop
+apply_cmd=/etc/init.d/slapd restart
+init_name=slapd

diff --git a/ldap-server/ldap-server-lib.pl b/ldap-server/ldap-server-lib.pl
index 1724e44..7afb209 100755 (executable)
--- a/ldap-server/ldap-server-lib.pl
+++ b/ldap-server/ldap-server-lib.pl
@@ -277,7 +277,7 @@ foreach my $file (&recursive_find_ldif($config{'config_file'})) {
                        $dir->{'value'} = $value;
                        push(@rv, $dir);
                        }
-               elsif (/^(\s+\S.*)$/ && @rv && $rv[$#rv]->{'file'} eq $file) {
+               elsif (/^\s+(\S.*)$/ && @rv && $rv[$#rv]->{'file'} eq $file) {
                        # Continuation line
                        local $dir = $rv[$#rv];
                        $dir->{'value'} .= $1;
@@ -860,7 +860,7 @@ foreach my $f (@ldap_lock_files) {
 sub unlock_slapd_files
 {
 foreach my $f (@ldap_lock_files) {
-       &lock_file($f);
+       &unlock_file($f);
        }
 @ldap_lock_files = ( );
 }