View | Details | Raw Unified | Return to bug 45221 | Differences between
and this patch

Collapse All | Expand All

(-)a/management/univention-ldap/10univention-ldap-server.inst (-6 / +6 lines)
 Lines 1-4    Link Here 
1 
#! /bin/sh
 1 

            

        

          2
          
#

          2
          
#

        

        

          3
          
# Univention LDAP Server

          3
          
# Univention LDAP Server

        

        

          4
          
#  join script

          4
          
#  join script

        

  

    

    

       Lines 114-121
      if [ "$server_role" = "domaincontroller_master" ]; then 
    
  Link Here 
    

  

        

          114
          

          114
          

        

        

          115
          
	if [ $JS_LAST_EXECUTED_VERSION -lt 1 ]; then

          115
          
	if [ $JS_LAST_EXECUTED_VERSION -lt 1 ]; then

        

        

          116
          

          116
          

        

          
            

              117
              
		forwardZone=$(univention-directory-manager dns/forward_zone list "$@" --filter zone="$domainname" | sed -ne 's/DN: //p;T;q')


              117
              
		forwardZone=$(univention-directory-manager dns/forward_zone list "$@" --filter zone="$domainname" | sed -ne 's/^DN: //p;T;q')

            

            

              118
              
		reverseZone=$(univention-directory-manager dns/reverse_zone list "$@" --filter subnet="$reverse" | sed -ne 's/DN: //p;T;q')


              118
              
		reverseZone=$(univention-directory-manager dns/reverse_zone list "$@" --filter subnet="$reverse" | sed -ne 's/^DN: //p;T;q')

            

        

          119
          

          119
          

        

        

          120
          
		if [ -z "$forwardZone" ]; then echo "DNS forward zone not found"; exit 1; fi

          120
          
		if [ -z "$forwardZone" ]; then echo "DNS forward zone not found"; exit 1; fi

        

        

          121
          
		if [ -z "$reverseZone" ]; then echo "DNS reverse zone not found"; exit 1; fi

          121
          
		if [ -z "$reverseZone" ]; then echo "DNS reverse zone not found"; exit 1; fi

        

  

    

    

       Lines 229-237
      if [ "$server_role" = "domaincontroller_master" ]; then 
    
  Link Here 
    

  

        

          229
          
		univention-directory-manager groups/group modify "$@" --dn "cn=$groups_default_domainusers,cn=groups,$ldap_base" --append users="uid=$users_default_administrator,cn=users,$ldap_base" || die

          229
          
		univention-directory-manager groups/group modify "$@" --dn "cn=$groups_default_domainusers,cn=groups,$ldap_base" --append users="uid=$users_default_administrator,cn=users,$ldap_base" || die

        

        

          230
          

          230
          

        

        

          231
          
		#create default network

          231
          
		#create default network

        

          
            

              232
              
		forwardZone=$(univention-directory-manager dns/forward_zone list "$@" --filter zone="$domainname" | sed -ne 's/DN: //p;T;q')


              232
              
		forwardZone=$(univention-directory-manager dns/forward_zone list "$@" --filter zone="$domainname" | sed -ne 's/^DN: //p;T;q')

            

            

              233
              
		reverseZone=$(univention-directory-manager dns/reverse_zone list "$@" --filter subnet="$reverse" | sed -ne 's/DN: //p;T;q')


              233
              
		reverseZone=$(univention-directory-manager dns/reverse_zone list "$@" --filter subnet="$reverse" | sed -ne 's/^DN: //p;T;q')

            

            

              234
              
		dhcpService=$(univention-directory-manager dhcp/service list "$@" | sed -ne 's/DN: //p;T;q')


              234
              
		dhcpService=$(univention-directory-manager dhcp/service list "$@" | sed -ne 's/^DN: //p;T;q')

            

        

          235
          

          235
          

        

        

          236
          
		univention-directory-manager networks/network create "$@" --ignore_exists --position "cn=networks,$ldap_base" --set name=default --set netmask="$NETMASK" --set network="$NETWORK" --set dnsEntryZoneForward="$forwardZone" --set dnsEntryZoneReverse="$reverseZone" --set dhcpEntryZone="$dhcpService" || die

          236
          
		univention-directory-manager networks/network create "$@" --ignore_exists --position "cn=networks,$ldap_base" --set name=default --set netmask="$NETMASK" --set network="$NETWORK" --set dnsEntryZoneForward="$forwardZone" --set dnsEntryZoneReverse="$reverseZone" --set dhcpEntryZone="$dhcpService" || die

        

        

          237
          
	fi

          237
          
	fi

        



(-)a/management/univention-ldap/univention-backup2master
      (-2 / +2 lines)




  

    

    

       Lines 405-411
      ldapmodify -x -D "cn=admin,$ldap_base" -w "$(cat /etc/ldap.secret)" -f "$temp_fi 
    
  Link Here 
    

  

        

          405
          

          405
          

        

        

          406
          
rm "$temp_file"

          406
          
rm "$temp_file"

        

        

          407
          

          407
          

        

          
            

              408
              
srv_dn=$(univention-directory-manager dns/srv_record list --superordinate zoneName="$domainname,cn=dns,$ldap_base" --filter relativeDomainName="_domaincontroller_master._tcp" | sed -ne 's|DN: ||p')


              408
              
srv_dn=$(univention-directory-manager dns/srv_record list --superordinate zoneName="$domainname,cn=dns,$ldap_base" --filter relativeDomainName="_domaincontroller_master._tcp" | sed -ne 's|^DN: ||p')

            

        

          409
          
univention-directory-manager dns/srv_record modify --superordinate zoneName="$domainname,cn=dns,$ldap_base" --dn "$srv_dn" --set location="0 0 0 $hostname.$domainname."

          409
          
univention-directory-manager dns/srv_record modify --superordinate zoneName="$domainname,cn=dns,$ldap_base" --dn "$srv_dn" --set location="0 0 0 $hostname.$domainname."

        

        

          410
          

          410
          

        

        

          411
          
old_ldap_master_hostname=$(echo "$old_ldap_master" | awk -F '.' '{print $1}')

          411
          
old_ldap_master_hostname=$(echo "$old_ldap_master" | awk -F '.' '{print $1}')

        

  

    

    

       Lines 517-523
      fi 
    
  Link Here 
    

  

        

          517
          

          517
          

        

        

          518
          
if [ -f /usr/share/pyshared/univention/admin/handlers/policies/thinclient.py ] ; then

          518
          
if [ -f /usr/share/pyshared/univention/admin/handlers/policies/thinclient.py ] ; then

        

        

          519
          
	# Remove the old master from the default settings of thin clients

          519
          
	# Remove the old master from the default settings of thin clients

        

          
            

              520
              
	def_dn=$(univention-directory-manager policies/thinclient list | sed -ne 's|DN: ||p')


              520
              
	def_dn=$(univention-directory-manager policies/thinclient list | sed -ne 's|^DN: ||p')

            

        

          521
          
	univention-directory-manager policies/thinclient modify --dn "$def_dn" --remove fileServer="$old_ldap_master"

          521
          
	univention-directory-manager policies/thinclient modify --dn "$def_dn" --remove fileServer="$old_ldap_master"

        

        

          522
          
fi

          522
          
fi

        

        

          523
          

          523
          

        



(-)a/services/univention-bind/05univention-bind.inst
      (-2 / +2 lines)




  

    

    

       Lines 86-98
      if [ $JS_LAST_EXECUTED_VERSION = 0 ]; then 
    
  Link Here 
    

  

        

          86
          

          86
          

        

        

          87
          
	# Append local server as DNS server to the zones, except if disabled by UCR

          87
          
	# Append local server as DNS server to the zones, except if disabled by UCR

        

        

          88
          
	if ! is_ucr_false dns/nameserver/registration/forward_zone; then

          88
          
	if ! is_ucr_false dns/nameserver/registration/forward_zone; then

        

          
            

              89
              
		zone="$(udm dns/forward_zone list "$@" --filter "(&(zone=$domainname)(!(nameserver=${hostname}.${domainname}.)))" | sed -ne 's|DN: ||p')"


              89
              
		zone="$(udm dns/forward_zone list "$@" --filter "(&(zone=$domainname)(!(nameserver=${hostname}.${domainname}.)))" | sed -ne 's|^DN: ||p')"

            

        

          90
          
		if [ -n "$zone" ]; then

          90
          
		if [ -n "$zone" ]; then

        

        

          91
          
			udm dns/forward_zone modify "$@" --dn "$zone" --append nameserver="${hostname}.${domainname}."

          91
          
			udm dns/forward_zone modify "$@" --dn "$zone" --append nameserver="${hostname}.${domainname}."

        

        

          92
          
		fi

          92
          
		fi

        

        

          93
          
	fi

          93
          
	fi

        

        

          94
          
	if ! is_ucr_false dns/nameserver/registration/reverse_zone; then

          94
          
	if ! is_ucr_false dns/nameserver/registration/reverse_zone; then

        

          
            

              95
              
		zone="$(udm dns/reverse_zone list "$@" --filter "(&(subnet=$reversezone)(!(nameserver=${hostname}.${domainname}.)))" | sed -ne 's|DN: ||p')"


              95
              
		zone="$(udm dns/reverse_zone list "$@" --filter "(&(subnet=$reversezone)(!(nameserver=${hostname}.${domainname}.)))" | sed -ne 's|^DN: ||p')"

            

        

          96
          
		if [ -n "$zone" ]; then

          96
          
		if [ -n "$zone" ]; then

        

        

          97
          
			udm dns/reverse_zone modify "$@" --dn "$zone" --append nameserver="${hostname}.${domainname}."

          97
          
			udm dns/reverse_zone modify "$@" --dn "$zone" --append nameserver="${hostname}.${domainname}."

        

        

          98
          
		fi

          98
          
		fi

        






  

  Return to bug 45221