View | Details | Raw Unified | Return to bug 34968
Collapse All | Expand All

(-)a/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/95rename_administrator (-3 / +3 lines)
 Lines 24-30   udm-test users/user create --position "cn=users,$ldap_base" \ Link Here 
24 
		--set password=univention \
 24 
		--set password=univention \
25 
		--set primaryGroup="cn=Domain Admins,cn=groups,$ldap_base"
 25 
		--set primaryGroup="cn=Domain Admins,cn=groups,$ldap_base"
26 

          26
          

        

          
            

              27
              
udm-test users/user modify --dn "uid=Administrator,cn=users,$ldap_base" --set username="$USERNAME"


              27
              
udm-test users/user modify --dn "uid=Administrator,cn=users,$ldap_base" --set username="$USERNAME" ||

            

            

              
              

              28
              
	fail_fast 1 "Failed to rename user 'Administrator'"

            

        

          28
          

          29
          

        

        

          29
          
# wait a little bit longer since we have to wait for the slapd restart

          30
          
# wait a little bit longer since we have to wait for the slapd restart

        

        

          30
          
trap "udm users/user modify --dn \"uid=$USERNAME,cn=users,$ldap_base\" --set username=\"Administrator\" \

          31
          
trap "udm users/user modify --dn \"uid=$USERNAME,cn=users,$ldap_base\" --set username=\"Administrator\" \

        

  

    

    

       Lines 48-54
      cat /etc/univention/templates/info/*.info | sed -ne 's|^File: ||p;s|^Multifile: 
    
  Link Here 
    

  

        

          48
          
	[ "$template" = etc/nagios3/nagios.cfg ] && continue #ignore comment

          49
          
	[ "$template" = etc/nagios3/nagios.cfg ] && continue #ignore comment

        

        

          49
          
	[ "$template" = etc/issue ] && continue #ignore comment

          50
          
	[ "$template" = etc/issue ] && continue #ignore comment

        

        

          50
          
	[ "$template" = etc/bind/named.conf.samba4 ] && continue # Bug #33892

          51
          
	[ "$template" = etc/bind/named.conf.samba4 ] && continue # Bug #33892

        

          
            

              51
              
	


              52
              

            

        

          52
          
	echo -n "Checking $template: "

          53
          
	echo -n "Checking $template: "

        

        

          53
          
	if [[ "$template" == etc/security/access-* ]]; then

          54
          
	if [[ "$template" == etc/security/access-* ]]; then

        

        

          54
          
		grep "Administrator," "/$template" && exit 1

          55
          
		grep "Administrator," "/$template" && exit 1

        

  

    

    

       Lines 75-78
      for file in /etc/ldap/slapd.conf \ 
    
  Link Here 
    

  

        

          75
          
done

          76
          
done

        

        

          76
          

          77
          

        

        

          77
          
exit "$RETVAL"

          78
          
exit "$RETVAL"

        

            

              78
              

              
              
            



(-)a/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/96rename_domain_admins
      (-3 / +3 lines)




  

    

    

       Lines 17-30
       
    
  Link Here 
    

  

        

          17
          
eval "$(ucr shell)"

          17
          
eval "$(ucr shell)"

        

        

          18
          

          18
          

        

        

          19
          
s4_services="$(univention-ldapsearch univentionService="Samba 4" | sed -ne 's|dn: ||p')"

          19
          
s4_services="$(univention-ldapsearch univentionService="Samba 4" | sed -ne 's|dn: ||p')"

        

          
            

              20
              
if [ -n "$s4_services" ]; then	


              20
              
if [ -n "$s4_services" ]; then

            

        

          21
          
	echo "Skip in S4 environments. See https://forge.univention.org/bugzilla/show_bug.cgi?id=34802."

          21
          
	echo "Skip in S4 environments. See https://forge.univention.org/bugzilla/show_bug.cgi?id=34802."

        

        

          22
          
	exit 137

          22
          
	exit 137

        

        

          23
          
fi

          23
          
fi

        

        

          24
          

          24
          

        

        

          25
          
GROUPNAME=$(group_randomnameme)

          25
          
GROUPNAME=$(group_randomnameme)

        

        

          26
          

          26
          

        

          
            

              27
              
udm-test groups/group modify --dn "cn=Domain Admins,cn=groups,$ldap_base" --set name="$GROUPNAME"


              27
              
udm-test groups/group modify --dn "cn=Domain Admins,cn=groups,$ldap_base" --set name="$GROUPNAME" ||

            

            

              
              

              28
              
	fail_fast 1 "Failed to rename group 'Domain Admins'"

            

        

          28
          

          29
          

        

        

          29
          
# wait a little bit longer since we have to wait for the slapd restart

          30
          
# wait a little bit longer since we have to wait for the slapd restart

        

        

          30
          
trap "udm-test groups/group modify --dn \"cn=$GROUPNAME,cn=groups,$ldap_base\" --set name=\"Domain Admins\"; \

          31
          
trap "udm-test groups/group modify --dn \"cn=$GROUPNAME,cn=groups,$ldap_base\" --set name=\"Domain Admins\"; \

        

  

    

    

       Lines 86-89
      if [ "$server_role" != "memberserver" ]; then 
    
  Link Here 
    

  

        

          86
          
fi

          87
          
fi

        

        

          87
          

          88
          

        

        

          88
          
exit "$RETVAL"

          89
          
exit "$RETVAL"

        

            

              89
              

              
              
            



(-)a/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/96rename_domain_users
      (-3 / +3 lines)




  

    

    

       Lines 15-28
       
    
  Link Here 
    

  

        

          15
          
. "$TESTLIBPATH/group.sh" || exit 137

          15
          
. "$TESTLIBPATH/group.sh" || exit 137

        

        

          16
          

          16
          

        

        

          17
          
s4_services="$(univention-ldapsearch univentionService="Samba 4" | sed -ne 's|dn: ||p')"

          17
          
s4_services="$(univention-ldapsearch univentionService="Samba 4" | sed -ne 's|dn: ||p')"

        

          
            

              18
              
if [ -n "$s4_services" ]; then	


              18
              
if [ -n "$s4_services" ]; then

            

        

          19
          
	echo "Skip in S4 environments. See https://forge.univention.org/bugzilla/show_bug.cgi?id=34802."

          19
          
	echo "Skip in S4 environments. See https://forge.univention.org/bugzilla/show_bug.cgi?id=34802."

        

        

          20
          
	exit 137

          20
          
	exit 137

        

        

          21
          
fi

          21
          
fi

        

        

          22
          

          22
          

        

        

          23
          
GROUPNAME=$(group_randomnameme)

          23
          
GROUPNAME=$(group_randomnameme)

        

        

          24
          

          24
          

        

          
            

              25
              
udm-test groups/group modify --dn "cn=Domain Users,cn=groups,$ldap_base" --set name="$GROUPNAME"


              25
              
udm-test groups/group modify --dn "cn=Domain Users,cn=groups,$ldap_base" --set name="$GROUPNAME" ||

            

            

              
              

              26
              
	fail_fast 1 "Failed to rename group 'Domain Users'"

            

        

          26
          

          27
          

        

        

          27
          
trap "udm-test groups/group modify --dn \"cn=$GROUPNAME,cn=groups,$ldap_base\" --set name=\"Domain Users\"; wait_for_replication_and_postrun" EXIT

          28
          
trap "udm-test groups/group modify --dn \"cn=$GROUPNAME,cn=groups,$ldap_base\" --set name=\"Domain Users\"; wait_for_replication_and_postrun" EXIT

        

        

          28
          

          29
          

        

  

    

    

       Lines 57-60
      for file in /etc/security/limits.conf; do 
    
  Link Here 
    

  

        

          57
          
done

          58
          
done

        

        

          58
          

          59
          

        

        

          59
          
exit "$RETVAL"

          60
          
exit "$RETVAL"

        

            

              60
              

              
              
            






  

  Return to bug 34968