From b6176c790631e86f344acc9e5e3eb4471b27300b Mon Sep 17 00:00:00 2001 Message-Id: From: Philipp Hahn Date: Tue, 20 Nov 2012 17:37:10 +0100 Subject: [PATCH] Bug #29216: Use get_default_netprefix() Organization: Univention GmbH, Bremen, Germany ipaddr.IPv6 does not like using netmask, but expects the prefix length. The result of get_default_netmask() is always passed to either univention-ipcal6 or udm-network/network, which both work with prefix length. Deprecate get_default_netmask() in favour of get_default_netprefix(), which returns the network prefix length instead of the netmask. --- .../ucs/base/univention-lib/debian/changelog | 24 ++++-- .../ucs-3.1/ucs/base/univention-lib/shell/base.sh | 9 ++ .../management/univention-join/debian/changelog | 11 ++- .../ucs/management/univention-join/debian/control | 2 +- .../ucs/management/univention-join/univention-join | 4 +- .../univention-ldap/10univention-ldap-server.inst | 6 +- .../management/univention-ldap/debian/changelog | 86 +++++++++++--------- .../ucs/management/univention-ldap/debian/control | 2 +- .../univention-bind/05univention-bind.inst | 6 +- .../ucs/services/univention-bind/debian/changelog | 23 +++-- .../ucs/services/univention-bind/debian/control | 2 +- 11 files changed, 104 insertions(+), 71 deletions(-) diff --git a/branches/ucs-3.1/ucs/base/univention-lib/debian/changelog b/branches/ucs-3.1/ucs/base/univention-lib/debian/changelog index 453f9e7..9974f18 100644 --- a/branches/ucs-3.1/ucs/base/univention-lib/debian/changelog +++ b/branches/ucs-3.1/ucs/base/univention-lib/debian/changelog @@ -1,3 +1,9 @@ +univention-lib (2.0.16-1) unstable; urgency=low + + * Deprecate get_default_netmask in favour of get_default_netprefix (Bug #29216) + + -- Philipp Hahn Tue, 20 Nov 2012 17:34:43 +0100 + univention-lib (2.0.15-1) unstable; urgency=low * Add low-level log support for package_manager (Bug #29037) @@ -184,14 +190,14 @@ univention-lib (1.0.72-1) unstable; urgency=low univention-lib (1.0.71-2) unstable; urgency=low - * fixed build dep (Bug #26536) + * fixed build dep (Bug #26536) -- Felix Botner Mon, 16 Apr 2012 09:59:38 +0200 univention-lib (1.0.71-1) unstable; urgency=low * added description for listener/shares/rename and - listener/shares/rename/fstypes (Bug #26536) + listener/shares/rename/fstypes (Bug #26536) -- Felix Botner Mon, 16 Apr 2012 09:51:47 +0200 @@ -203,7 +209,7 @@ univention-lib (1.0.70-1) unstable; urgency=low univention-lib (1.0.45-1) unstable; urgency=low - * fixed python/listenerSharePath.py (Bug #26025) + * fixed python/listenerSharePath.py (Bug #26025) -- Felix Botner Thu, 23 Feb 2012 11:10:14 +0100 @@ -215,13 +221,13 @@ univention-lib (1.0.44-1) unstable; urgency=low univention-lib (1.0.43-1) unstable; urgency=low - * added python lib to rename directories (Bug #26025) + * added python lib to rename directories (Bug #26025) -- Felix Botner Fri, 03 Feb 2012 14:29:30 +0100 univention-lib (1.0.42-1) unstable; urgency=low - * fixed ldap search filter in getMailFromMailOrUid.py (Bug #23739) + * fixed ldap search filter in getMailFromMailOrUid.py (Bug #23739) -- Felix Botner Thu, 24 Nov 2011 09:36:08 +0100 @@ -245,7 +251,7 @@ univention-lib (1.0.39-1) unstable; urgency=low univention-lib (1.0.38-1) unstable; urgency=low - * escape ldap filter in python/getMailFromMailOrUid.py (Bug #23739) + * escape ldap filter in python/getMailFromMailOrUid.py (Bug #23739) -- Felix Botner Tue, 08 Nov 2011 08:54:44 +0100 @@ -258,7 +264,7 @@ univention-lib (1.0.37-1) unstable; urgency=low univention-lib (1.0.36-1) unstable; urgency=low - * shell/umc.sh: added check whether UMC frontend is installed for + * shell/umc.sh: added check whether UMC frontend is installed for umc_frontend_new_hash (Bug #22881) -- Alexander Kläser Wed, 02 Nov 2011 17:14:31 +0100 @@ -308,7 +314,7 @@ univention-lib (1.0.30-1) unstable; urgency=low univention-lib (1.0.29-1) unstable; urgency=low - * added logrotate/notifempty to ucrLogrotate helper (Bug #18002) + * added logrotate/notifempty to ucrLogrotate helper (Bug #18002) -- Felix Botner Wed, 12 Oct 2011 12:38:59 +0200 @@ -332,7 +338,7 @@ univention-lib (1.0.26-1) unstable; urgency=low univention-lib (1.0.25-1) unstable; urgency=low - * added python/ucrLogrotate.py (Bug #18002) + * added python/ucrLogrotate.py (Bug #18002) -- Felix Botner Tue, 11 Oct 2011 15:41:41 +0200 diff --git a/branches/ucs-3.1/ucs/base/univention-lib/shell/base.sh b/branches/ucs-3.1/ucs/base/univention-lib/shell/base.sh index dce84a0..dbafa3b 100644 --- a/branches/ucs-3.1/ucs/base/univention-lib/shell/base.sh +++ b/branches/ucs-3.1/ucs/base/univention-lib/shell/base.sh @@ -140,6 +140,7 @@ get_default_ipv6_address () { # # returns the default netmask +# DEPRECATED: will be removed soon # get_default_netmask () { PYTHONPATH=/usr/lib/pymodules/python2.6/univention/config_registry python2.6 2>/dev/null \ @@ -147,6 +148,14 @@ get_default_netmask () { } # +# returns the default network prefix length +# +get_default_netprefix () { + PYTHONPATH=/usr/lib/pymodules/python2.6/univention/config_registry python2.6 2>/dev/null \ + -c 'from interfaces import Interfaces;print Interfaces().get_default_ip_address().prefixlen' +} + +# # returns the default network # get_default_network () { diff --git a/branches/ucs-3.1/ucs/management/univention-join/debian/changelog b/branches/ucs-3.1/ucs/management/univention-join/debian/changelog index 142500a..5e3cc85 100644 --- a/branches/ucs-3.1/ucs/management/univention-join/debian/changelog +++ b/branches/ucs-3.1/ucs/management/univention-join/debian/changelog @@ -1,3 +1,10 @@ +univention-join (5.0.21-1) unstable; urgency=low + + * Use get_default_netprefix() instead of deprecated get_default_netmask() + (Bug #29216) + + -- Philipp Hahn Tue, 20 Nov 2012 18:20:17 +0100 + univention-join (5.0.20-1) unstable; urgency=low * Fix memory leak (Bug #27432) @@ -6,7 +13,7 @@ univention-join (5.0.20-1) unstable; urgency=low univention-join (5.0.19-1) unstable; urgency=low - * removed obsolete server-join.log log file (Bug #13105) + * removed obsolete server-join.log log file (Bug #13105) -- Felix Botner Mon, 19 Nov 2012 09:54:05 +0100 @@ -24,7 +31,7 @@ univention-join (5.0.17-1) unstable; urgency=low univention-join (5.0.16-1) unstable; urgency=low - * check versions in univention-join (Bug #25824) + * check versions in univention-join (Bug #25824) -- Felix Botner Fri, 02 Nov 2012 09:26:20 +0100 diff --git a/branches/ucs-3.1/ucs/management/univention-join/debian/control b/branches/ucs-3.1/ucs/management/univention-join/debian/control index 2082239..945aa0f 100644 --- a/branches/ucs-3.1/ucs/management/univention-join/debian/control +++ b/branches/ucs-3.1/ucs/management/univention-join/debian/control @@ -13,7 +13,7 @@ Architecture: all Depends: ${misc:Depends}, univention-directory-manager-tools (>> 7.0.147), univention-config-registry, - shell-univention-lib (>= 1.0.22), + shell-univention-lib (>= 2.0.16), univention-ssh (>= 3.0.1-2), tofrodos, ldap-utils, diff --git a/branches/ucs-3.1/ucs/management/univention-join/univention-join b/branches/ucs-3.1/ucs/management/univention-join/univention-join index 8162d9f..2dbb94d 100755 --- a/branches/ucs-3.1/ucs/management/univention-join/univention-join +++ b/branches/ucs-3.1/ucs/management/univention-join/univention-join @@ -382,9 +382,9 @@ IP="$(get_default_ip_address)" if [ -n "$IP" ]; then args+=(-ip "$IP") if [ "${master_version:0:1}" -ge 3 ]; then - NETMASK="$(get_default_netmask)" + NETPREFIX="$(get_default_netprefix)" # Since UCS 3.0 it is possible to append the netmask - args+=(-netmask "$NETMASK") + args+=(-netmask "$NETPREFIX") fi fi mac_addr="$(LC_ALL=C ip link show | sed -rne 's|.*link/ether ([0-9a-fA-F:]+) brd .*|\1|p' | head -n1)" diff --git a/branches/ucs-3.1/ucs/management/univention-ldap/10univention-ldap-server.inst b/branches/ucs-3.1/ucs/management/univention-ldap/10univention-ldap-server.inst index 08564fe..615a622 100755 --- a/branches/ucs-3.1/ucs/management/univention-ldap/10univention-ldap-server.inst +++ b/branches/ucs-3.1/ucs/management/univention-ldap/10univention-ldap-server.inst @@ -51,10 +51,10 @@ local_is_ucr_false () { # test if UCS variable is "true" or "false" eval "$(univention-config-registry shell)" IP="$(get_default_ip_address)" -NETMASK="$(get_default_netmask)" +NETPREFIX="$(get_default_netprefix)" NETWORK="$(get_default_network)" -reverse=$(univention-ipcalc6 --netmask "$NETMASK" --ip "$IP" --output reverse --calcdns) +reverse=$(univention-ipcalc6 --netmask "$NETPREFIX" --ip "$IP" --output reverse --calcdns) wait_named () { sleep ${1:-5} @@ -233,7 +233,7 @@ if [ "$server_role" = "domaincontroller_master" ]; then 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 + univention-directory-manager networks/network create "$@" --ignore_exists --position "cn=networks,$ldap_base" --set name=default --set netmask="$NETPREFIX" --set network="$NETWORK" --set dnsEntryZoneForward="$forwardZone" --set dnsEntryZoneReverse="$reverseZone" --set dhcpEntryZone="$dhcpService" || die fi fi diff --git a/branches/ucs-3.1/ucs/management/univention-ldap/debian/changelog b/branches/ucs-3.1/ucs/management/univention-ldap/debian/changelog index c6501a2..795b245 100644 --- a/branches/ucs-3.1/ucs/management/univention-ldap/debian/changelog +++ b/branches/ucs-3.1/ucs/management/univention-ldap/debian/changelog @@ -1,3 +1,10 @@ +univention-ldap (9.0.20-1) unstable; urgency=low + + * Use get_default_netprefix() instead of deprecated get_default_netmask() + (Bug #29216) + + -- Philipp Hahn Tue, 20 Nov 2012 18:20:58 +0100 + univention-ldap (9.0.19-1) unstable; urgency=low * Re-change univentionLicenseUniventionDesktops to @@ -29,7 +36,6 @@ univention-ldap (9.0.16-1) unstable; urgency=low thinclient policies if the related module exists (Bug #27617) - -- Lukas Walter Tue, 16 Oct 2012 15:42:08 +0200 univention-ldap (9.0.15-1) unstable; urgency=low @@ -151,7 +157,7 @@ univention-ldap (8.0.91-1) unstable; urgency=low univention-ldap (8.0.90-1) unstable; urgency=low - * fix handling multiple servers in ldap/server/addition (Bug #27050) + * fix handling multiple servers in ldap/server/addition (Bug #27050) -- Arvid Requate Tue, 10 Jul 2012 14:58:59 +0200 @@ -247,7 +253,7 @@ univention-ldap (8.0.84-3) unstable; urgency=low * univention-backup2master: apt-get is now invoked with option -y to avoid interactivity (Bug #14568). - + * univention-backup2master: The function resolve_reference does not offer to remove LDAP entries any more (Bug #10038). @@ -278,13 +284,13 @@ univention-ldap (8.0.84-1) unstable; urgency=low univention-ldap (8.0.83-2) unstable; urgency=low - * reverted last commit (Bug #27016) + * reverted last commit (Bug #27016) -- Felix Botner Thu, 14 Jun 2012 11:19:15 +0200 univention-ldap (8.0.83-1) unstable; urgency=low - * new default "yes" for ldap/acl/user/password/change (Bug #27016) + * new default "yes" for ldap/acl/user/password/change (Bug #27016) -- Felix Botner Wed, 13 Jun 2012 09:02:21 +0200 @@ -442,7 +448,7 @@ univention-ldap (8.0.71-1) unstable; urgency=low univention-ldap (8.0.70-2) unstable; urgency=low * call convert_univentionMailSharedFolderDeliveryAddress only on DC - master (Bug #24503) + master (Bug #24503) -- Sönke Schwardt-Krummrich Fri, 11 Nov 2011 12:41:09 +0100 @@ -532,7 +538,7 @@ univention-ldap (8.0.58-1) unstable; urgency=low univention-ldap (8.0.57-1) unstable; urgency=low - * readded univentionDefaultKolabHomeServer to univention-ldap and + * readded univentionDefaultKolabHomeServer to univention-ldap and removed transition schema file form kolab legacy package (Bug #23483) -- Sönke Schwardt-Krummrich Wed, 26 Oct 2011 17:31:53 +0200 @@ -704,7 +710,7 @@ univention-ldap (8.0.39-1) unstable; urgency=low univention-ldap (8.0.38-2) unstable; urgency=low * Remove the policy container cn=windowsinstallations since univention-windows-installer - is being removed in UCS 3.0 (Bug #17625) + is being removed in UCS 3.0 (Bug #17625) -- Moritz Muehlenhoff Thu, 29 Sep 2011 10:40:00 +0200 @@ -1075,14 +1081,14 @@ univention-ldap (7.0.18-1) unstable; urgency=low * call fix_primary_group_membership of univention-directory-manager-tools (Bug #21711) - * added dependency to + * added dependency to univention-directory-manager-tools (>>6.0.110) -- Sönke Schwardt Tue, 08 Mar 2011 14:09:24 +0100 univention-ldap (7.0.17-1) unstable; urgency=low - * fixed typo (univention-prinquota) in join script + * fixed typo (univention-prinquota) in join script 10univention-ldap-server.inst and replace value in settings/packages during update (Bug #21187) @@ -1196,7 +1202,7 @@ univention-ldap (7.0.4-1) unstable; urgency=low univention-ldap (7.0.3-2) unstable; urgency=low * Add four new attributes to control dual monitor setups - (Bug #12124) + (Bug #12124) -- Moritz Muehlenhoff Thu, 24 Jun 2010 16:47:31 +0200 @@ -1221,7 +1227,7 @@ univention-ldap (7.0.1-1) unstable; urgency=low univention-ldap (7.0.0-1) unstable; urgency=low * version bump for UCS 2.4 - * use reverse instead of network from univention-ipcalc for adding/editing reverse zone + * use reverse instead of network from univention-ipcalc for adding/editing reverse zone * use fqdn with . at the and as nameserver for creating dns zone Bug #17413 * use email address syntax for contact address in dns zone Bug #18461 @@ -1342,7 +1348,7 @@ univention-ldap (5.0.14-1) unstable; urgency=low univention-ldap (5.0.13-1) unstable; urgency=low - * fixed typo in schema/mail.schema Bug #17226 + * fixed typo in schema/mail.schema Bug #17226 -- Felix Botner Mon, 11 Jan 2010 17:07:35 +0100 @@ -1416,7 +1422,7 @@ univention-ldap (5.0.5-1) unstable; urgency=low univention-ldap (5.0.4-2) unstable; urgency=low - * birthday attribute for "univentionPerson" objclass (Bug: #15119) + * birthday attribute for "univentionPerson" objclass (Bug: #15119) -- Felix Botner Wed, 16 Sep 2009 14:28:24 +0200 @@ -1628,7 +1634,7 @@ univention-ldap (3.0.12-3) unstable; urgency=low univention-ldap (3.0.12-2) unstable; urgency=low - * new autostart test in init script + * new autostart test in init script -- Felix Botner Tue, 28 Oct 2008 14:03:09 +0100 @@ -1765,13 +1771,13 @@ univention-ldap (2.4.10-1) unstable; urgency=low univention-ldap (2.4.8-1) unstable; urgency=low * only the user herself and cn=admin may access the user's admin settings - object + object -- Andreas B�sching Mon, 19 Nov 2007 11:40:01 +0100 univention-ldap (2.4.7-1) unstable; urgency=low - * provide access to admin settings objects for cn=admin + * provide access to admin settings objects for cn=admin -- Andreas Büsching Fri, 16 Nov 2007 12:01:16 +0100 @@ -1790,7 +1796,7 @@ univention-ldap (2.4.6-2) unstable; urgency=low univention-ldap (2.4.6-1) unstable; urgency=low - * fix access rights to own admin settings object + * fix access rights to own admin settings object -- Andreas Büsching Fri, 9 Nov 2007 15:58:22 +0100 @@ -1969,7 +1975,7 @@ univention-ldap (2.2.5-1) unstable; urgency=low univention-ldap (2.2.4-7) unstable; urgency=low - * modified PackageLists for Policies + * modified PackageLists for Policies -- Bastian Neumann Fri, 20 Jul 2007 10:25:06 +0200 @@ -1996,13 +2002,13 @@ univention-ldap (2.2.4-4) unstable; urgency=low univention-ldap (2.2.4-3) unstable; urgency=low * set dependency to univention-directory-manager-tools instead of - univention-admin-tools + univention-admin-tools -- Andreas Büsching Mon, 09 Jul 2007 16:46:32 +0200 univention-ldap (2.2.4-2) unstable; urgency=low - * added descriptions for default container in univention-admin + * added descriptions for default container in univention-admin -- Bastian Neumann Wed, 20 Jun 2007 13:14:14 +0200 @@ -2015,7 +2021,7 @@ univention-ldap (2.2.4-1) unstable; urgency=low univention-ldap (2.2.3-6) unstable; urgency=low * added translation.ldif for updating old base.ldif containers - * added update mechanism + * added update mechanism * added german and english Descriptions for default containers -- Bastian Neumann Tue, 19 Jun 2007 16:14:31 +0200 @@ -2068,13 +2074,13 @@ univention-ldap (2.2.1-1) unstable; urgency=low univention-ldap (2.2.0-3) unstable; urgency=low - * added German Translation for Standard Container Description + * added German Translation for Standard Container Description -- Bastian Neumann Thu, 24 May 2007 13:42:51 +0200 univention-ldap (2.2.0-2) unstable; urgency=low - * added Description for Standard Container + * added Description for Standard Container -- Bastian Neumann Thu, 24 May 2007 13:26:17 +0200 @@ -2099,7 +2105,7 @@ univention-ldap (2.0.0-1) unstable; urgency=low univention-ldap (1.43-19) unstable; urgency=low - * use UTF-8 string type for location attribute of univentionPrinter objectclass + * use UTF-8 string type for location attribute of univentionPrinter objectclass -- Andreas BÃŒsching Wed, 20 Dec 2006 09:41:38 +0100 @@ -2279,7 +2285,7 @@ univention-ldap (1.42-23) unstable; urgency=low univention-ldap (1.42-19) unstable; urgency=low - * added LDAP ACLs for nested groups + * added LDAP ACLs for nested groups -- Lars Rehe Mon, 22 May 2006 14:15:05 +0200 @@ -2342,19 +2348,19 @@ univention-ldap (1.42-6) unstable; urgency=low univention-ldap (1.42-5) unstable; urgency=low - * increased version number for build system needs + * increased version number for build system needs -- Wolf Wiegand Tue, 7 Mar 2006 15:22:50 +0100 univention-ldap (1.42-4) unstable; urgency=low - * only use approx-indeces with new installations + * only use approx-indeces with new installations -- Wolf Wiegand Tue, 7 Mar 2006 15:20:44 +0100 univention-ldap (1.42-3) unstable; urgency=low - * add support for approx-indeces in slapd.conf-template + * add support for approx-indeces in slapd.conf-template -- Wolf Wiegand Tue, 7 Mar 2006 09:57:26 +0100 @@ -2422,7 +2428,7 @@ univention-ldap (1.40-1) unstable; urgency=low univention-ldap (1.38) unstable; urgency=low - * added support for samba account policies + * added support for samba account policies -- Wolf Wiegand Thu, 25 Aug 2005 09:48:19 +0200 @@ -2442,7 +2448,7 @@ univention-ldap (1.36) unstable; urgency=low univention-ldap (1.35) unstable; urgency=low - * disallow sambaPasswordHistory anonymous read + * disallow sambaPasswordHistory anonymous read -- Stefan Gohmann Wed, 11 May 2005 08:31:07 +0200 @@ -2475,7 +2481,7 @@ univention-ldap (1.30) unstable; urgency=low * added idmap container for sid <-> uid mapping * added displaySize schema-entries for xfree-policy - * added printer schema-entries + * added printer schema-entries -- Ingo Steuwer Fri, 4 Feb 2005 11:02:13 +0100 @@ -2501,7 +2507,7 @@ univention-ldap (1.27) unstable; urgency=low univention-ldap (1.26) unstable; urgency=low - * added as400 schema + * added as400 schema -- Sven Dreyer Fri, 15 Oct 2004 14:18:20 +0200 @@ -2525,7 +2531,7 @@ univention-ldap (1.23) unstable; urgency=low univention-ldap (1.22) unstable; urgency=low - * template.schema extended to reflect changes in univention-admin-tools + * template.schema extended to reflect changes in univention-admin-tools * Add four new license attributes for maximum number of accounts, clients, groupware accounts and UCS managed clients. @@ -2539,19 +2545,19 @@ univention-ldap (1.21) unstable; urgency=low univention-ldap (1.20) unstable; urgency=low - * fixed initscript path statements + * fixed initscript path statements -- Sven Dreyer Fri, 30 Jul 2004 10:55:23 +0200 univention-ldap (1.19) unstable; urgency=low - * added /usr/sbin/univention-ldap-backup + * added /usr/sbin/univention-ldap-backup -- Stefan Gohmann Mon, 12 Jul 2004 07:03:27 +0200 univention-ldap (1.18) unstable; urgency=low - * added courier schema + * added courier schema -- Sven Dreyer Tue, 18 May 2004 17:42:28 +0200 @@ -2603,7 +2609,7 @@ univention-ldap (1.12) unstable; urgency=low univention-ldap (1.11) unstable; urgency=low - * added cron job for LDAP backup + * added cron job for LDAP backup -- Sven Dreyer Tue, 30 Mar 2004 18:11:55 +0200 @@ -2634,7 +2640,7 @@ univention-ldap (1.7) unstable; urgency=low univention-ldap (1.7) unstable; urgency=low - * added cron job for LDAP backup + * added cron job for LDAP backup -- Sven Dreyer Tue, 30 Mar 2004 18:12:25 +0200 @@ -2669,7 +2675,7 @@ univention-ldap (1.3) unstable; urgency=low univention-ldap (1.2) unstable; urgency=low - * new versioning scheme + * new versioning scheme -- Roland Bauerschmidt Tue, 20 May 2003 13:33:41 +0200 diff --git a/branches/ucs-3.1/ucs/management/univention-ldap/debian/control b/branches/ucs-3.1/ucs/management/univention-ldap/debian/control index bbeb2bf..94f7aa4 100644 --- a/branches/ucs-3.1/ucs/management/univention-ldap/debian/control +++ b/branches/ucs-3.1/ucs/management/univention-ldap/debian/control @@ -23,7 +23,7 @@ Depends: ${misc:Depends}, univention-ipcalc, univention-ldap-acl-master | univention-ldap-acl-slave, bind9-host, - shell-univention-lib (>= 1.0.23), + shell-univention-lib (>= 2.0.16), univention-newsid, univention-join Conflicts: univention-5250 (<< 0.5), diff --git a/branches/ucs-3.1/ucs/services/univention-bind/05univention-bind.inst b/branches/ucs-3.1/ucs/services/univention-bind/05univention-bind.inst index e694a0c..e9b6fca 100755 --- a/branches/ucs-3.1/ucs/services/univention-bind/05univention-bind.inst +++ b/branches/ucs-3.1/ucs/services/univention-bind/05univention-bind.inst @@ -62,7 +62,7 @@ if [ $JS_LAST_EXECUTED_VERSION = 0 ]; then #search for existing zone IP="$(get_default_ip_address)" - NETMASK="$(get_default_netmask)" + NETPREFIX="$(get_default_netprefix)" zone="$(univention-directory-manager dns/forward_zone list "$@" --filter zone=$domainname | grep ^DN:)" @@ -74,9 +74,9 @@ if [ $JS_LAST_EXECUTED_VERSION = 0 ]; then wait_for_dns /usr/share/univention-admin-tools/univention-dnsedit "$@" --ignore-exists "$domainname" add a "$hostname" "$IP" || die - reversezone=$(univention-ipcalc6 --netmask "$NETMASK" --ip "$IP" --output reverse --calcdns) + reversezone=$(univention-ipcalc6 --netmask "$NETPREFIX" --ip "$IP" --output reverse --calcdns) if [ -z "$reversezone" ]; then exit 1; fi - ptr=$(univention-ipcalc6 --netmask "$NETMASK" --ip "$IP" --output pointer --calcdns) + ptr=$(univention-ipcalc6 --netmask "$NETPREFIX" --ip "$IP" --output pointer --calcdns) if [ -z "$ptr" ]; then exit 1; fi /usr/share/univention-admin-tools/univention-dnsedit "$@" --ignore-exists --reverse "$reversezone" add zone "root@$domainname." 1 28800 7200 604800 10800 "$hostname.$domainname." || die diff --git a/branches/ucs-3.1/ucs/services/univention-bind/debian/changelog b/branches/ucs-3.1/ucs/services/univention-bind/debian/changelog index ce12048..fe3746e 100644 --- a/branches/ucs-3.1/ucs/services/univention-bind/debian/changelog +++ b/branches/ucs-3.1/ucs/services/univention-bind/debian/changelog @@ -1,3 +1,10 @@ +univention-bind (7.0.10-1) unstable; urgency=low + + * Use get_default_netprefix() instead of deprecated get_default_netmask() + (Bug #29216) + + -- Philipp Hahn Tue, 20 Nov 2012 18:20:32 +0100 + univention-bind (7.0.9-4) unstable; urgency=low * modified descriptions of UCR variables: @@ -16,7 +23,7 @@ univention-bind (7.0.9-3) unstable; urgency=low univention-bind (7.0.9-2) unstable; urgency=low - * fixed typo in changelog (Bug #28065) + * fixed typo in changelog (Bug #28065) -- Tobias Peters Wed, 17 Oct 2012 16:28:33 +0200 @@ -59,7 +66,7 @@ univention-bind (7.0.7-2) unstable; urgency=low univention-bind (7.0.7-1) unstable; urgency=low - * deactivated the dns and gc registration on a DC slave in an ucs@school environment (Bug #28065) + * deactivated the dns and gc registration on a DC slave in an ucs@school environment (Bug #28065) -- Tobias Peters Thu, 11 Oct 2012 11:23:22 +0200 @@ -186,7 +193,7 @@ univention-bind (6.0.38-3) unstable; urgency=low * conffiles/etc/bind/named.conf.proxy, conffiles/etc/bind/named.conf.samba4: - If dns/fakeroot is False, then zone "." generated with type "hint" + If dns/fakeroot is False, then zone "." generated with type "hint" Generated comments explain why zone "." is generated with type master, forward or hint. Used tabulators in generated lines for better indentation. @@ -477,7 +484,7 @@ univention-bind (6.0.0-1) unstable; urgency=low univention-bind (5.0.22-1) unstable; urgency=low * bumped version (for integration of 2.4-2 version at a later point) - * included directory var/cache/univention-bind-proxy in + * included directory var/cache/univention-bind-proxy in debian/univention-bind{,-proxy}.dirs and removed mkdir command for this directory from debian/univention-bind-proxy.postinst (Bug #21197) @@ -543,7 +550,7 @@ univention-bind (4.0.5-1) unstable; urgency=low univention-bind (4.0.4-1) unstable; urgency=low - * updated copyright Bug #17222 + * updated copyright Bug #17222 -- Felix Botner Thu, 07 Jan 2010 13:59:56 +0100 @@ -680,7 +687,7 @@ univention-bind (2.0.3-4) unstable; urgency=low univention-bind (2.0.3-3) unstable; urgency=low - * set bind/autostart to 'yes' by default if not already set + * set bind/autostart to 'yes' by default if not already set -- Andreas Büsching Wed, 18 Jul 2007 16:18:44 +0200 @@ -698,7 +705,7 @@ univention-bind (2.0.2-5) unstable; urgency=low univention-bind (2.0.2-3) unstable; urgency=low - * add service information files + * add service information files -- Andreas Büsching Mon, 18 Jun 2007 14:54:03 +0200 @@ -873,5 +880,3 @@ univention-bind (0.1.univention) unstable; urgency=low * Initial Release. -- Stefan Gohmann Thu, 6 Mar 2003 08:37:11 +0200 - - diff --git a/branches/ucs-3.1/ucs/services/univention-bind/debian/control b/branches/ucs-3.1/ucs/services/univention-bind/debian/control index fcf8e31..1028b8b 100644 --- a/branches/ucs-3.1/ucs/services/univention-bind/debian/control +++ b/branches/ucs-3.1/ucs/services/univention-bind/debian/control @@ -16,7 +16,7 @@ Depends: ${misc:Depends}, bind9 (>= 1:9.8.0.P4), univention-directory-manager-tools (>> 7.0.147), univention-runit (>= 0.2), - shell-univention-lib (>= 1.0.23), + shell-univention-lib (>= 2.0.16), univention-ipcalc Conflicts: univention-dns, univention-bind-proxy (<= 6.0.0) -- 1.7.1