--- a/management/univention-ldap/10univention-ldap-server.inst +++ a/management/univention-ldap/10univention-ldap-server.inst @@ -1,4 +1,4 @@ -#! /bin/sh + # # Univention LDAP Server # join script @@ -114,8 +114,8 @@ if [ "$server_role" = "domaincontroller_master" ]; then if [ $JS_LAST_EXECUTED_VERSION -lt 1 ]; then - forwardZone=$(univention-directory-manager dns/forward_zone list "$@" --filter zone="$domainname" | sed -ne 's/DN: //p;T;q') - reverseZone=$(univention-directory-manager dns/reverse_zone list "$@" --filter subnet="$reverse" | sed -ne 's/DN: //p;T;q') + forwardZone=$(univention-directory-manager dns/forward_zone list "$@" --filter zone="$domainname" | sed -ne 's/^DN: //p;T;q') + reverseZone=$(univention-directory-manager dns/reverse_zone list "$@" --filter subnet="$reverse" | sed -ne 's/^DN: //p;T;q') if [ -z "$forwardZone" ]; then echo "DNS forward zone not found"; exit 1; fi if [ -z "$reverseZone" ]; then echo "DNS reverse zone not found"; exit 1; fi @@ -229,9 +229,9 @@ if [ "$server_role" = "domaincontroller_master" ]; then 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 #create default network - forwardZone=$(univention-directory-manager dns/forward_zone list "$@" --filter zone="$domainname" | sed -ne 's/DN: //p;T;q') - reverseZone=$(univention-directory-manager dns/reverse_zone list "$@" --filter subnet="$reverse" | sed -ne 's/DN: //p;T;q') - dhcpService=$(univention-directory-manager dhcp/service list "$@" | sed -ne 's/DN: //p;T;q') + forwardZone=$(univention-directory-manager dns/forward_zone list "$@" --filter zone="$domainname" | sed -ne 's/^DN: //p;T;q') + reverseZone=$(univention-directory-manager dns/reverse_zone list "$@" --filter subnet="$reverse" | sed -ne 's/^DN: //p;T;q') + dhcpService=$(univention-directory-manager dhcp/service list "$@" | sed -ne 's/^DN: //p;T;q') 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 fi --- a/management/univention-ldap/univention-backup2master +++ a/management/univention-ldap/univention-backup2master @@ -405,7 +405,7 @@ ldapmodify -x -D "cn=admin,$ldap_base" -w "$(cat /etc/ldap.secret)" -f "$temp_fi rm "$temp_file" -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') +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') univention-directory-manager dns/srv_record modify --superordinate zoneName="$domainname,cn=dns,$ldap_base" --dn "$srv_dn" --set location="0 0 0 $hostname.$domainname." old_ldap_master_hostname=$(echo "$old_ldap_master" | awk -F '.' '{print $1}') @@ -517,7 +517,7 @@ fi if [ -f /usr/share/pyshared/univention/admin/handlers/policies/thinclient.py ] ; then # Remove the old master from the default settings of thin clients - def_dn=$(univention-directory-manager policies/thinclient list | sed -ne 's|DN: ||p') + def_dn=$(univention-directory-manager policies/thinclient list | sed -ne 's|^DN: ||p') univention-directory-manager policies/thinclient modify --dn "$def_dn" --remove fileServer="$old_ldap_master" fi --- a/services/univention-bind/05univention-bind.inst +++ a/services/univention-bind/05univention-bind.inst @@ -86,13 +86,13 @@ if [ $JS_LAST_EXECUTED_VERSION = 0 ]; then # Append local server as DNS server to the zones, except if disabled by UCR if ! is_ucr_false dns/nameserver/registration/forward_zone; then - zone="$(udm dns/forward_zone list "$@" --filter "(&(zone=$domainname)(!(nameserver=${hostname}.${domainname}.)))" | sed -ne 's|DN: ||p')" + zone="$(udm dns/forward_zone list "$@" --filter "(&(zone=$domainname)(!(nameserver=${hostname}.${domainname}.)))" | sed -ne 's|^DN: ||p')" if [ -n "$zone" ]; then udm dns/forward_zone modify "$@" --dn "$zone" --append nameserver="${hostname}.${domainname}." fi fi if ! is_ucr_false dns/nameserver/registration/reverse_zone; then - zone="$(udm dns/reverse_zone list "$@" --filter "(&(subnet=$reversezone)(!(nameserver=${hostname}.${domainname}.)))" | sed -ne 's|DN: ||p')" + zone="$(udm dns/reverse_zone list "$@" --filter "(&(subnet=$reversezone)(!(nameserver=${hostname}.${domainname}.)))" | sed -ne 's|^DN: ||p')" if [ -n "$zone" ]; then udm dns/reverse_zone modify "$@" --dn "$zone" --append nameserver="${hostname}.${domainname}." fi