SHA256
1
0
forked from pool/dhcp

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
This commit is contained in:
Marius Tomaschewski 2012-03-28 15:29:59 +00:00 committed by Git OBS Bridge
parent 97d7fc195d
commit c67cc23113
6 changed files with 51 additions and 18 deletions

View File

@ -28,10 +28,16 @@
#send dhcp-lease-time 3600; #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; 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 several well known/usefull dhcp options.
request subnet-mask, broadcast-address, routers, request subnet-mask, broadcast-address, routers,
rfc3442-classless-static-routes, rfc3442-classless-static-routes,
@ -39,7 +45,8 @@ request subnet-mask, broadcast-address, routers,
domain-name-servers, nis-domain, nis-servers, domain-name-servers, nis-domain, nis-servers,
nds-context, nds-servers, nds-tree-name, nds-context, nds-servers, nds-tree-name,
netbios-name-servers, netbios-dd-server, 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: # We request above options, require only the IP configuration:
require subnet-mask; require subnet-mask;

View File

@ -1,9 +1,13 @@
# Client configuration file example for DHCPv6 # 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) # The client side command to enable rapid-commit (2 packet exchange)
send dhcp6.rapid-commit; send dhcp6.rapid-commit;
# name-servers and domain-search are requested by default. # name-servers and domain-search are requested by default.
# here is the way to request sip-servers-addresses too # 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;

View File

@ -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 Mon Mar 19 09:37:52 UTC 2012 - mt@suse.com

View File

@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
%define isc_version 4.2.3-P2 %define isc_version 4.2.3-P2
%define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
@ -37,12 +36,11 @@ BuildRequires: openldap2-devel
%endif %endif
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: libtool BuildRequires: libtool
License: BSD-3-Clause
Group: Productivity/Networking/Boot/Servers
AutoReqProv: on
Version: 4.2.3.P2 Version: 4.2.3.P2
Release: 0.<RELEASE0> Release: 0.<RELEASE0>
Summary: Common Files Used by ISC DHCP Software Summary: Common Files Used by ISC DHCP Software
License: BSD-3-Clause
Group: Productivity/Networking/Boot/Servers
Url: http://www.isc.org/software/dhcp Url: http://www.isc.org/software/dhcp
Source0: dhcp-%{isc_version}.tar.bz2 Source0: dhcp-%{isc_version}.tar.bz2
# #
@ -97,31 +95,29 @@ PreReq: /bin/touch /sbin/chkconfig sysconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package server %package server
License: BSD-3-Clause
Summary: ISC DHCP Server Summary: ISC DHCP Server
Group: Productivity/Networking/Boot/Servers 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 PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd
AutoReqProv: on
%package client %package client
License: BSD-3-Clause
Summary: ISC DHCP Client Summary: ISC DHCP Client
Group: Productivity/Networking/Boot/Clients 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 PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /bin/grep
AutoReqProv: on
%package relay %package relay
License: BSD-3-Clause
Summary: ISC DHCP Relay Agent Summary: ISC DHCP Relay Agent
Group: Productivity/Networking/Boot/Servers 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 PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp
AutoReqProv: on
%package devel %package devel
License: BSD-3-Clause
Summary: Header Files and Libraries for dhcpctl API Summary: Header Files and Libraries for dhcpctl API
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: dhcp = %{version} Requires: dhcp = %{version}
@ -129,7 +125,6 @@ Requires: dhcp = %{version}
%if %{with_doc_package} %if %{with_doc_package}
%package doc %package doc
License: BSD-3-Clause
Summary: Documentation Summary: Documentation
Group: Productivity/Networking/Boot/Servers Group: Productivity/Networking/Boot/Servers
%endif %endif

View File

@ -59,6 +59,16 @@
# #
#option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; #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 # No service will be given on this subnet, but declaring it helps the
# DHCP server to understand the network topology. # DHCP server to understand the network topology.

View File

@ -8,6 +8,17 @@
# /etc/sysconfig/dhcpd file. # /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. # From the file used for TAHI tests.
# #