Bug #52970: handle no OU 'DEMOSCHOOL' and no user 'demo_admin'

univention · Mar 22, 2021 · def0866 · def0866
1 parent 820701a
commit def0866
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ucs-school-metapackage/62ucs-school-master.inst b/ucs-school-metapackage/62ucs-school-master.inst
@@ -185,7 +185,9 @@ fi
 
 # Bug #52970: add 'school_admin' role to user 'demo_admin' (missing prior to 4.4 v9)
 if [ $JS_LAST_EXECUTED_VERSION -lt 10 ] ; then
-	if ! univention-ldapsearch -LLL uid=demo_admin ucsschoolRole | grep -q 'school_admin:school:DEMOSCHOOL'; then
+	if univention-ldapsearch -LLL uid=demo_admin dn | grep -q 'uid=demo_admin' && \
+	  ! univention-ldapsearch -LLL uid=demo_admin ucsschoolRole | grep -q 'school_admin:school:DEMOSCHOOL'
+  then
 		udm users/user modify "$@" \
 			--dn "uid=demo_admin,cn=lehrer,cn=users,ou=DEMOSCHOOL,$ldap_base" \
 			--append "ucsschoolRole=school_admin:school:DEMOSCHOOL" || die

diff --git a/ucs-school-metapackage/debian/changelog b/ucs-school-metapackage/debian/changelog
@@ -1,3 +1,9 @@
+ucs-school-metapackage (12.0.4-13) unstable; urgency=low
+
+  * Bug #52970: handle no OU "DEMOSCHOOL" and no user "demo_admin"
+
+ -- Daniel Troeder <troeder@univention.de>  Mon, 22 Mar 2021 15:26:37 +0100
+
 ucs-school-metapackage (12.0.4-12) unstable; urgency=low
 
   * Bug #52970: add 'school_admin' role to user 'demo_admin' when updating