From c67cc2311333e58accb5d2dc4320693d850016a28ada6922b65c2ac20acb2bdc Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Wed, 28 Mar 2012 15:29:59 +0000 Subject: [PATCH] TEST: - Added RFC 4833 TimeZone PosixString and Name declarations to server and client configs [not used yet]. OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=90 --- dhclient.conf | 11 +++++++++-- dhclient6.conf | 6 +++++- dhcp.changes | 6 ++++++ dhcp.spec | 25 ++++++++++--------------- dhcpd.conf | 10 ++++++++++ dhcpd6.conf | 11 +++++++++++ 6 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dhclient.conf b/dhclient.conf index c1a4340..130340d 100644 --- a/dhclient.conf +++ b/dhclient.conf @@ -28,10 +28,16 @@ #send dhcp-lease-time 3600; # -# define classless static route option +# Define RFC 3442 classless static route option # option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; +# +# Define RFC 4833 timezone options +# +option rfc4833-tz-posix-string code 100 = string; +option rfc4833-tz-name code 101 = string; + # Request several well known/usefull dhcp options. request subnet-mask, broadcast-address, routers, rfc3442-classless-static-routes, @@ -39,7 +45,8 @@ request subnet-mask, broadcast-address, routers, domain-name-servers, nis-domain, nis-servers, nds-context, nds-servers, nds-tree-name, netbios-name-servers, netbios-dd-server, - netbios-node-type, netbios-scope, ntp-servers; + netbios-node-type, netbios-scope, ntp-servers, + rfc4833-tz-posix-string, rfc4833-tz-name; # We request above options, require only the IP configuration: require subnet-mask; diff --git a/dhclient6.conf b/dhclient6.conf index 66ec4b6..1b3aff8 100644 --- a/dhclient6.conf +++ b/dhclient6.conf @@ -1,9 +1,13 @@ # Client configuration file example for DHCPv6 +option dhcp6.rfc4833-tz-posix-string code 41 = string; +option dhcp6.rfc4833-tz-name code 42 = string; + # The client side command to enable rapid-commit (2 packet exchange) send dhcp6.rapid-commit; # name-servers and domain-search are requested by default. # here is the way to request sip-servers-addresses too -also request dhcp6.sip-servers-addresses; +also request dhcp6.sip-servers-addresses, + dhcp6.rfc4833-tz-posix-string, dhcp6.rfc4833-tz-name; diff --git a/dhcp.changes b/dhcp.changes index 22fea1a..c5e2bdc 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 28 15:06:47 UTC 2012 - mt@suse.com + +- Added RFC 4833 TimeZone PosixString and Name declarations to + server and client configs [not used yet]. + ------------------------------------------------------------------- Mon Mar 19 09:37:52 UTC 2012 - mt@suse.com diff --git a/dhcp.spec b/dhcp.spec index 5b308f5..8e24455 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define isc_version 4.2.3-P2 %define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services @@ -37,12 +36,11 @@ BuildRequires: openldap2-devel %endif BuildRequires: dos2unix BuildRequires: libtool -License: BSD-3-Clause -Group: Productivity/Networking/Boot/Servers -AutoReqProv: on Version: 4.2.3.P2 Release: 0. Summary: Common Files Used by ISC DHCP Software +License: BSD-3-Clause +Group: Productivity/Networking/Boot/Servers Url: http://www.isc.org/software/dhcp Source0: dhcp-%{isc_version}.tar.bz2 # @@ -97,31 +95,29 @@ PreReq: /bin/touch /sbin/chkconfig sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %package server -License: BSD-3-Clause Summary: ISC DHCP Server Group: Productivity/Networking/Boot/Servers -Requires: net-tools dhcp = %{version} +Requires: dhcp = %{version} +Requires: net-tools PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd -AutoReqProv: on %package client -License: BSD-3-Clause Summary: ISC DHCP Client Group: Productivity/Networking/Boot/Clients -Requires: net-tools dhcp = %{version} /sbin/arping /usr/bin/host +Requires: /sbin/arping +Requires: /usr/bin/host +Requires: dhcp = %{version} +Requires: net-tools PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /bin/grep -AutoReqProv: on %package relay -License: BSD-3-Clause Summary: ISC DHCP Relay Agent Group: Productivity/Networking/Boot/Servers -Requires: net-tools dhcp = %{version} +Requires: dhcp = %{version} +Requires: net-tools PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp -AutoReqProv: on %package devel -License: BSD-3-Clause Summary: Header Files and Libraries for dhcpctl API Group: Development/Libraries/C and C++ Requires: dhcp = %{version} @@ -129,7 +125,6 @@ Requires: dhcp = %{version} %if %{with_doc_package} %package doc -License: BSD-3-Clause Summary: Documentation Group: Productivity/Networking/Boot/Servers %endif diff --git a/dhcpd.conf b/dhcpd.conf index 89e8422..b320e16 100644 --- a/dhcpd.conf +++ b/dhcpd.conf @@ -59,6 +59,16 @@ # #option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; +# +# Define RFC 4833 timezone options: +# +#option rfc4833-tz-posix-string code 100 = string; +#option rfc4833-tz-name code 101 = string; +# +# Use example: +# option rfc4833-tz-posix-string "EST5EDT4,M3.2.0/02:00,M11.1.0/02:00"; +# option rfc4833-tz-name "Europe/Zurich"; + # No service will be given on this subnet, but declaring it helps the # DHCP server to understand the network topology. diff --git a/dhcpd6.conf b/dhcpd6.conf index 94e5fb1..d611bac 100644 --- a/dhcpd6.conf +++ b/dhcpd6.conf @@ -8,6 +8,17 @@ # /etc/sysconfig/dhcpd file. # +# +# Define RFC 4833 timezone options: +# +#option dhcp6.rfc4833-tz-posix-string code 41 = string; +#option dhcp6.rfc4833-tz-name code 42 = string; +# +# Use example: +# option dhcp6.rfc4833-tz-posix-string "EST5EDT4,M3.2.0/02:00,M11.1.0/02:00"; +# option dhcp6.rfc4833-tz-name "Europe/Zurich"; + + # From the file used for TAHI tests. #