1 |
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 |
2 |
--- e-smith-base+ldap-4.19.1/root/var/service/ldap/run 2008-04-28 14:32:37.000000000 +0200 |
3 |
+++ mezzanine_patched_e-smith-base+ldap-4.19.1/root/var/service/ldap/run 2008-04-28 14:32:06.000000000 +0200 |
4 |
@@ -35,18 +35,20 @@ |
5 |
then |
6 |
if [ -e "$old_ldif" ] |
7 |
then |
8 |
- old_base_dn=$(basename $old_ldif | sed -e 's/.ldif$//' -e 's/./,dc=/g' -e 's/^/dc=/') |
9 |
- base_dn=$(echo $domain | sed -e 's/./,dc=/g' -e 's/^/dc=/') |
10 |
- sed -e "s/$old_base_dn/$base_dn/" \ |
11 |
- -e 's/objectClass: group/objectClass: posixGroup/' < $old_ldif | \ |
12 |
- setuidgid ldap slapadd -c |
13 |
+ old_base_dn=$(basename $old_ldif | sed -e 's/.ldif$//' -e 's/\./,dc=/g' -e 's/^/dc=/') |
14 |
+ old_dc=$(basename $old_ldif | /bin/cut -d"." -f1) |
15 |
+ base_dn=$(echo $domain | sed -e 's/\./,dc=/g' -e 's/^/dc=/') |
16 |
+ dc=$(echo $domain | /bin/cut -d"." -f 1) |
17 |
+ sed -e "s/$old_base_dn/$base_dn/g" -e "s/^dc: $old_dc/dc: $dc/" $old_ldif > $ldif |
18 |
+ sed -e 's/objectClass: group/objectClass: posixGroup/' < $ldif | \ |
19 |
+ setuidgid ldap slapadd -c |
20 |
else |
21 |
- if [ \! -e "$ldif" ] |
22 |
- then |
23 |
- /sbin/e-smith/expand-template /home/e-smith/db/ldap/ldif |
24 |
- fi |
25 |
- sed -e 's/objectClass: group/objectClass: posixGroup/' < $ldif | \ |
26 |
- setuidgid ldap slapadd -c |
27 |
+ if [ \! -e "$ldif" ] |
28 |
+ then |
29 |
+ /sbin/e-smith/expand-template /home/e-smith/db/ldap/ldif |
30 |
+ fi |
31 |
+ sed -e 's/objectClass: group/objectClass: posixGroup/' < $ldif | \ |
32 |
+ setuidgid ldap slapadd -c |
33 |
fi |
34 |
fi |
35 |
|