diff -Nur -x '*.orig' -x '*.rej' e-smith-ldap-5.2.0/root/var/service/ldap/run mezzanine_patched_e-smith-ldap-5.2.0/root/var/service/ldap/run --- e-smith-ldap-5.2.0/root/var/service/ldap/run 2010-11-29 19:38:24.000000000 +0100 +++ mezzanine_patched_e-smith-ldap-5.2.0/root/var/service/ldap/run 2010-11-29 19:38:06.000000000 +0100 @@ -46,15 +46,15 @@ then if [ -e "$old_ldif" ] then - grep -q "objectClass: dcObject" "$ldif" || /sbin/e-smith/expand-template /home/e-smith/db/ldap/ldif perl ./convert_ldif < $old_ldif | \ setuidgid ldap slapadd -c else if [ \! -e "$ldif" ] then - /sbin/e-smith/expand-template /home/e-smith/db/ldap/ldif + touch $ldif fi - setuidgid ldap slapadd -c < $ldif + perl ./convert_ldif < $ldif | \ + setuidgid ldap slapadd -c fi fi