Browse Source

Use ldapadd to load ldif without changetype

Étienne BERSAC 8 years ago
parent
commit
752ac6d7f9
1 changed files with 5 additions and 1 deletions
  1. 5 1
      image/service/slapd/startup.sh

+ 5 - 1
image/service/slapd/startup.sh

@@ -223,7 +223,11 @@ EOF
         log-helper debug "Processing file ${f}"
         sed -i "s|{{ LDAP_BASE_DN }}|${LDAP_BASE_DN}|g" $f
         sed -i "s|{{ LDAP_BACKEND }}|${LDAP_BACKEND}|g" $f
-        ldapmodify -Y EXTERNAL -Q -H ldapi:/// -f $f 2>&1 | log-helper debug || ldapmodify -h localhost -p 389 -D cn=admin,$LDAP_BASE_DN -w $LDAP_ADMIN_PASSWORD -f $f 2>&1 | log-helper debug
+        if grep -iq changetype $f ; then
+            ldapmodify -Y EXTERNAL -Q -H ldapi:/// -f $f 2>&1 | log-helper debug || ldapmodify -h localhost -p 389 -D cn=admin,$LDAP_BASE_DN -w $LDAP_ADMIN_PASSWORD -f $f 2>&1 | log-helper debug
+        else
+            ldapadd -Y EXTERNAL -Q -H ldapi:/// -f $f |& log-helper debug
+        fi
       done
 
       # read only user