diff -Nur -x '*.orig' -x '*.rej' e-smith-base+ldap-4.19.1/root/var/service/ldap/run mezzanine_patched_e-smith-base+ldap-4.19.1/root/var/service/ldap/run
--- e-smith-base+ldap-4.19.1/root/var/service/ldap/run	2008-04-28 14:32:37.000000000 +0200
+++ mezzanine_patched_e-smith-base+ldap-4.19.1/root/var/service/ldap/run	2008-04-28 14:32:06.000000000 +0200
@@ -35,18 +35,20 @@
 then
     if [ -e "$old_ldif" ]
     then
-	old_base_dn=$(basename $old_ldif | sed -e 's/.ldif$//' -e 's/./,dc=/g' -e 's/^/dc=/')
-	base_dn=$(echo $domain | sed -e 's/./,dc=/g' -e 's/^/dc=/')
-	sed -e "s/$old_base_dn/$base_dn/" \
-	    -e 's/objectClass: group/objectClass: posixGroup/' < $old_ldif | \
-	    setuidgid ldap slapadd -c
+        old_base_dn=$(basename $old_ldif | sed -e 's/.ldif$//' -e 's/\./,dc=/g' -e 's/^/dc=/')
+        old_dc=$(basename $old_ldif | /bin/cut -d"." -f1)
+        base_dn=$(echo $domain | sed -e 's/\./,dc=/g' -e 's/^/dc=/')
+        dc=$(echo $domain | /bin/cut -d"." -f 1)
+        sed -e "s/$old_base_dn/$base_dn/g" -e "s/^dc: $old_dc/dc: $dc/" $old_ldif > $ldif
+        sed -e 's/objectClass: group/objectClass: posixGroup/' < $ldif | \
+            setuidgid ldap slapadd -c
     else
-	if [ \! -e "$ldif" ]
-	then
-	    /sbin/e-smith/expand-template /home/e-smith/db/ldap/ldif
-	fi
-	sed -e 's/objectClass: group/objectClass: posixGroup/' < $ldif | \
-	    setuidgid ldap slapadd -c
+        if [ \! -e "$ldif" ]
+        then
+            /sbin/e-smith/expand-template /home/e-smith/db/ldap/ldif
+        fi
+        sed -e 's/objectClass: group/objectClass: posixGroup/' < $ldif | \
+            setuidgid ldap slapadd -c
     fi
 fi