Merge branch 'zsoerenm-remove-schema-ambiguity' into hotfix-1.2.2

BertrandGouny · BertrandGouny · commit b2f68b20371d · 2018-05-15T09:38:39.000+02:00
diff --git a/image/service/slapd/startup.sh b/image/service/slapd/startup.sh
@@ -54,7 +54,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   }
 
   function is_new_schema() {
-    local COUNT=$(ldapsearch -Q -Y EXTERNAL -H ldapi:/// -b cn=schema,cn=config cn | grep -c $1)
+    local COUNT=$(ldapsearch -Q -Y EXTERNAL -H ldapi:/// -b cn=schema,cn=config cn | grep -c "}$1,")
     if [ "$COUNT" -eq 0 ]; then
       echo 1
     else

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`function is_new_schema() {`
`57`		`- local COUNT=$(ldapsearch -Q -Y EXTERNAL -H ldapi:/// -b cn=schema,cn=config cn \| grep -c $1)`
	`57`	`+ local COUNT=$(ldapsearch -Q -Y EXTERNAL -H ldapi:/// -b cn=schema,cn=config cn \| grep -c "}$1,")`
`58`	`58`	`if [ "$COUNT" -eq 0 ]; then`
`59`	`59`	`echo 1`
`60`	`60`	`else`