Merge branch 'asacamano-patch-1' into release-1.1.10

BertrandGouny · BertrandGouny · commit 56311f18695c · 2017-10-04T17:08:13.000+02:00
diff --git a/image/service/slapd/startup.sh b/image/service/slapd/startup.sh
@@ -69,7 +69,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then
     if grep -iq changetype $LDIF_FILE ; then
         ldapmodify -Y EXTERNAL -Q -H ldapi:/// -f $LDIF_FILE 2>&1 | log-helper debug || ldapmodify -h localhost -p 389 -D cn=admin,$LDAP_BASE_DN -w $LDAP_ADMIN_PASSWORD -f $LDIF_FILE 2>&1 | log-helper debug
     else
-        ldapadd -Y EXTERNAL -Q -H ldapi:/// -f $LDIF_FILE |& log-helper debug
+        ldapadd -Y EXTERNAL -Q -H ldapi:/// -f $LDIF_FILE |& log-helper debug || ldapadd -h localhost -p 389 -D cn=admin,$LDAP_BASE_DN -w $LDAP_ADMIN_PASSWORD -f $LDIF_FILE 2>&1 | log-helper debug
     fi
   }
 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then`
`69`	`69`	`if grep -iq changetype $LDIF_FILE ; then`
`70`	`70`	`ldapmodify -Y EXTERNAL -Q -H ldapi:/// -f $LDIF_FILE 2>&1 \| log-helper debug \|\| ldapmodify -h localhost -p 389 -D cn=admin,$LDAP_BASE_DN -w $LDAP_ADMIN_PASSWORD -f $LDIF_FILE 2>&1 \| log-helper debug`
`71`	`71`	`else`
`72`		`- ldapadd -Y EXTERNAL -Q -H ldapi:/// -f $LDIF_FILE \|& log-helper debug`
	`72`	`+ ldapadd -Y EXTERNAL -Q -H ldapi:/// -f $LDIF_FILE \|& log-helper debug \|\| ldapadd -h localhost -p 389 -D cn=admin,$LDAP_BASE_DN -w $LDAP_ADMIN_PASSWORD -f $LDIF_FILE 2>&1 \| log-helper debug`
`73`	`73`	`fi`
`74`	`74`	`}`
`75`	`75`