rpms/dhcp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

4.3.5b1

Browse Source
This commit is contained in:
Jiri Popelka 2016-09-12 17:24:05 +02:00
parent e98359bfb4
commit 7a016a6260
7 changed files with 140 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -29,3 +29,4 @@
/dhcp-4.3.3.tar.gz /dhcp-4.3.3.tar.gz
/dhcp-4.3.3-P1.tar.gz /dhcp-4.3.3-P1.tar.gz
/dhcp-4.3.4.tar.gz /dhcp-4.3.4.tar.gz
/dhcp-4.3.5b1.tar.gz

21
dhcp-getifaddrs.patch
View File

@ -1,7 +1,7 @@
diff -up dhcp-4.3.2b1/common/discover.c.getifaddrs dhcp-4.3.2b1/common/discover.c diff -up dhcp-4.3.5b1/common/discover.c.getifaddrs dhcp-4.3.5b1/common/discover.c
--- dhcp-4.3.2b1/common/discover.c.getifaddrs 2015-01-29 14:52:57.000000000 +0100 --- dhcp-4.3.5b1/common/discover.c.getifaddrs 2016-09-12 17:10:39.585374741 +0200
+++ dhcp-4.3.2b1/common/discover.c 2015-02-08 17:48:39.435651386 +0100 +++ dhcp-4.3.5b1/common/discover.c 2016-09-12 17:15:56.160628636 +0200
@@ -373,391 +373,13 @@ end_iface_scan(struct iface_conf_list *i @@ -373,392 +373,13 @@ end_iface_scan(struct iface_conf_list *i
ifaces->sock = -1; ifaces->sock = -1;
} }
@ -296,7 +296,7 @@ diff -up dhcp-4.3.2b1/common/discover.c.getifaddrs dhcp-4.3.2b1/common/discover.
- log_error("IPv6 interface name '%s' too long", name); - log_error("IPv6 interface name '%s' too long", name);
- return 0; - return 0;
- } - }
- strcpy(info->name, name); - strncpy(info->name, name, sizeof(info->name) - 1);
- -
-#ifdef SKIP_DUMMY_INTERFACES -#ifdef SKIP_DUMMY_INTERFACES
- } while (strncmp(info->name, "dummy", 5) == 0); - } while (strncmp(info->name, "dummy", 5) == 0);
@ -334,7 +334,7 @@ diff -up dhcp-4.3.2b1/common/discover.c.getifaddrs dhcp-4.3.2b1/common/discover.
- * Get our flags. - * Get our flags.
- */ - */
- memset(&tmp, 0, sizeof(tmp)); - memset(&tmp, 0, sizeof(tmp));
- strcpy(tmp.ifr_name, name); - strncpy(tmp.ifr_name, name, sizeof(tmp.ifr_name) - 1);
- if (ioctl(ifaces->sock, SIOCGIFFLAGS, &tmp) < 0) { - if (ioctl(ifaces->sock, SIOCGIFFLAGS, &tmp) < 0) {
- log_error("Error getting interface flags for '%s'; %m", name); - log_error("Error getting interface flags for '%s'; %m", name);
- *err = 1; - *err = 1;
@ -355,6 +355,7 @@ diff -up dhcp-4.3.2b1/common/discover.c.getifaddrs dhcp-4.3.2b1/common/discover.
- */ - */
-int -int
-next_iface(struct iface_info *info, int *err, struct iface_conf_list *ifaces) { -next_iface(struct iface_info *info, int *err, struct iface_conf_list *ifaces) {
- memset(info, 0, sizeof(struct iface_info));
- if (next_iface4(info, err, ifaces)) { - if (next_iface4(info, err, ifaces)) {
- return 1; - return 1;
- } - }
@ -394,7 +395,7 @@ diff -up dhcp-4.3.2b1/common/discover.c.getifaddrs dhcp-4.3.2b1/common/discover.
* function. * function.
* *
* The getifaddrs() man page describes the use. * The getifaddrs() man page describes the use.
@@ -805,6 +427,8 @@ begin_iface_scan(struct iface_conf_list @@ -806,6 +427,8 @@ begin_iface_scan(struct iface_conf_list
*/ */
int int
next_iface(struct iface_info *info, int *err, struct iface_conf_list *ifaces) { next_iface(struct iface_info *info, int *err, struct iface_conf_list *ifaces) {
@ -403,10 +404,10 @@ diff -up dhcp-4.3.2b1/common/discover.c.getifaddrs dhcp-4.3.2b1/common/discover.
if (ifaces->next == NULL) { if (ifaces->next == NULL) {
*err = 0; *err = 0;
return 0; return 0;
@@ -816,8 +440,20 @@ next_iface(struct iface_info *info, int @@ -818,8 +441,20 @@ next_iface(struct iface_info *info, int
return 0;
} }
strcpy(info->name, ifaces->next->ifa_name); memset(info, 0, sizeof(struct iface_info));
strncpy(info->name, ifaces->next->ifa_name, sizeof(info->name) - 1);
- memcpy(&info->addr, ifaces->next->ifa_addr, - memcpy(&info->addr, ifaces->next->ifa_addr,
- ifaces->next->ifa_addr->sa_len); - ifaces->next->ifa_addr->sa_len);
+ +

109
dhcp-manpages.patch
View File

@ -1,7 +1,38 @@
diff -up dhcp-4.3.0a1/client/dhclient-script.8.man dhcp-4.3.0a1/client/dhclient-script.8 diff -up dhcp-4.3.5b1/client/dhclient.conf.5.man dhcp-4.3.5b1/client/dhclient.conf.5
--- dhcp-4.3.0a1/client/dhclient-script.8.man 2013-12-11 01:01:02.000000000 +0100 --- dhcp-4.3.5b1/client/dhclient.conf.5.man 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.0a1/client/dhclient-script.8 2013-12-19 15:27:17.617118805 +0100 +++ dhcp-4.3.5b1/client/dhclient.conf.5 2016-09-12 17:09:23.243313514 +0200
@@ -48,7 +48,7 @@ customizations are needed, they should b @@ -228,7 +228,8 @@ responding to the client send the client
options. Only the option names should be specified in the request
statement - not option parameters. By default, the DHCPv4 client
requests the subnet-mask, broadcast-address, time-offset, routers,
-domain-name, domain-name-servers and host-name options while the DHCPv6
+domain-search, domain-name, domain-name-servers, host-name, nis-domain,
+nis-servers, ntp-servers and interface-mtu options while the DHCPv6
client requests the dhcp6 name-servers and domain-search options. Note
that if you enter a \'request\' statement, you over-ride these defaults
and these options will not be requested.
@@ -736,6 +737,17 @@ know the DHCP service(s) anycast MAC add
client. The \fIlink-type\fR and \fImac-address\fR parameters are configured
in a similar manner to the \fBhardware\fR statement.
.PP
+ \fBbootp-broadcast-always;\fR
+.PP
+The
+.B bootp-broadcast-always
+statement instructs dhclient to always set the bootp broadcast flag in
+request packets, so that servers will always broadcast replies.
+This is equivalent to supplying the dhclient -B argument, and has
+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
+This option is provided as an extension to enable dhclient to work
+on IBM s390 Linux guests.
+.PP
.SH SAMPLE
The following configuration file was used on a laptop running NetBSD
1.3, though the domains have been modified.
diff -up dhcp-4.3.5b1/client/dhclient-script.8.man dhcp-4.3.5b1/client/dhclient-script.8
--- dhcp-4.3.5b1/client/dhclient-script.8.man 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.5b1/client/dhclient-script.8 2016-09-12 17:08:09.516254385 +0200
@@ -45,7 +45,7 @@ customizations are needed, they should b
exit hooks provided (see HOOKS for details). These hooks will allow the exit hooks provided (see HOOKS for details). These hooks will allow the
user to override the default behaviour of the client in creating a user to override the default behaviour of the client in creating a
.B /etc/resolv.conf .B /etc/resolv.conf
@ -10,7 +41,7 @@ diff -up dhcp-4.3.0a1/client/dhclient-script.8.man dhcp-4.3.0a1/client/dhclient-
.PP .PP
No standard client script exists for some operating systems, even though No standard client script exists for some operating systems, even though
the actual client may work, so a pioneering user may well need to create the actual client may work, so a pioneering user may well need to create
@@ -92,6 +92,26 @@ present. The @@ -89,6 +89,26 @@ present. The
.B ETCDIR/dhclient-exit-hooks .B ETCDIR/dhclient-exit-hooks
script can modify the valid of exit_status to change the exit status script can modify the valid of exit_status to change the exit status
of dhclient-script. of dhclient-script.
@ -37,50 +68,10 @@ diff -up dhcp-4.3.0a1/client/dhclient-script.8.man dhcp-4.3.0a1/client/dhclient-
.SH OPERATION .SH OPERATION
When dhclient needs to invoke the client configuration script, it When dhclient needs to invoke the client configuration script, it
defines a set of variables in the environment, and then invokes defines a set of variables in the environment, and then invokes
diff -up dhcp-4.3.0a1/client/dhclient.conf.5.man dhcp-4.3.0a1/client/dhclient.conf.5 diff -up dhcp-4.3.5b1/common/dhcp-options.5.man dhcp-4.3.5b1/common/dhcp-options.5
--- dhcp-4.3.0a1/client/dhclient.conf.5.man 2013-12-11 01:01:02.000000000 +0100 --- dhcp-4.3.5b1/common/dhcp-options.5.man 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.0a1/client/dhclient.conf.5 2013-12-19 15:27:17.617118805 +0100 +++ dhcp-4.3.5b1/common/dhcp-options.5 2016-09-12 17:08:09.517254386 +0200
@@ -202,7 +202,8 @@ responding to the client send the client @@ -1013,6 +1013,21 @@ classless IP routing - it does not inclu
options. Only the option names should be specified in the request
statement - not option parameters. By default, the DHCPv4 client
requests the subnet-mask, broadcast-address, time-offset, routers,
-domain-name, domain-name-servers and host-name options while the DHCPv6
+domain-search, domain-name, domain-name-servers, host-name, nis-domain,
+nis-servers, ntp-servers and interface-mtu options while the DHCPv6
client requests the dhcp6 name-servers and domain-search options. Note
that if you enter a \'request\' statement, you over-ride these defaults
and these options will not be requested.
@@ -688,6 +689,17 @@ know the DHCP service(s) anycast MAC add
client. The \fIlink-type\fR and \fImac-address\fR parameters are configured
in a similar manner to the \fBhardware\fR statement.
.PP
+ \fBbootp-broadcast-always;\fR
+.PP
+The
+.B bootp-broadcast-always
+statement instructs dhclient to always set the bootp broadcast flag in
+request packets, so that servers will always broadcast replies.
+This is equivalent to supplying the dhclient -B argument, and has
+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
+This option is provided as an extension to enable dhclient to work
+on IBM s390 Linux guests.
+.PP
.SH SAMPLE
The following configuration file is used on a laptop running NetBSD
1.3. The laptop has an IP alias of 192.5.5.213, and has one
@@ -713,7 +725,7 @@ interface "ep0" {
supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com";
prepend domain-name-servers 127.0.0.1;
request subnet-mask, broadcast-address, time-offset, routers,
- domain-name, domain-name-servers, host-name;
+ domain-search, domain-name, domain-name-servers, host-name;
require subnet-mask, domain-name-servers;
script "CLIENTBINDIR/dhclient-script";
media "media 10baseT/UTP", "media 10base2/BNC";
diff -up dhcp-4.3.0a1/common/dhcp-options.5.man dhcp-4.3.0a1/common/dhcp-options.5
--- dhcp-4.3.0a1/common/dhcp-options.5.man 2013-12-11 01:25:12.000000000 +0100
+++ dhcp-4.3.0a1/common/dhcp-options.5 2013-12-19 15:27:17.618118791 +0100
@@ -914,6 +914,21 @@ classless IP routing - it does not inclu
classless IP routing is now the most widely deployed routing standard, classless IP routing is now the most widely deployed routing standard,
this option is virtually useless, and is not implemented by any of the this option is virtually useless, and is not implemented by any of the
popular DHCP clients, for example the Microsoft DHCP client. popular DHCP clients, for example the Microsoft DHCP client.
@ -102,10 +93,10 @@ diff -up dhcp-4.3.0a1/common/dhcp-options.5.man dhcp-4.3.0a1/common/dhcp-options
.RE .RE
.PP .PP
.nf .nf
diff -up dhcp-4.3.0a1/server/dhcpd.conf.5.man dhcp-4.3.0a1/server/dhcpd.conf.5 diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5
--- dhcp-4.3.0a1/server/dhcpd.conf.5.man 2013-12-13 21:49:44.000000000 +0100 --- dhcp-4.3.5b1/server/dhcpd.conf.5.man 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.0a1/server/dhcpd.conf.5 2013-12-19 15:30:14.266670962 +0100 +++ dhcp-4.3.5b1/server/dhcpd.conf.5 2016-09-12 17:10:11.205351980 +0200
@@ -527,6 +527,9 @@ pool { @@ -528,6 +528,9 @@ pool {
}; };
.fi .fi
.PP .PP
@ -115,19 +106,19 @@ diff -up dhcp-4.3.0a1/server/dhcpd.conf.5.man dhcp-4.3.0a1/server/dhcpd.conf.5
The server currently does very little sanity checking, so if you The server currently does very little sanity checking, so if you
configure it wrong, it will just fail in odd ways. I would recommend configure it wrong, it will just fail in odd ways. I would recommend
therefore that you either do failover or don't do failover, but don't therefore that you either do failover or don't do failover, but don't
@@ -541,9 +544,9 @@ primary server might look like this: @@ -542,9 +545,9 @@ primary server might look like this:
failover peer "foo" { failover peer "foo" {
primary; primary;
address anthrax.rc.vix.com; address anthrax.rc.example.com;
- port 519; - port 519;
+ port 647; + port 647;
peer address trantor.rc.vix.com; peer address trantor.rc.example.com;
- peer port 520; - peer port 520;
+ peer port 847; + peer port 847;
max-response-delay 60; max-response-delay 60;
max-unacked-updates 10; max-unacked-updates 10;
mclt 3600; mclt 3600;
@@ -1241,7 +1244,7 @@ the zone containing PTR records - for IS @@ -1246,7 +1249,7 @@ the zone containing PTR records - for IS
.PP .PP
.nf .nf
key DHCP_UPDATER { key DHCP_UPDATER {
@ -136,7 +127,7 @@ diff -up dhcp-4.3.0a1/server/dhcpd.conf.5.man dhcp-4.3.0a1/server/dhcpd.conf.5
secret pRP5FapFoJ95JEL06sv4PQ==; secret pRP5FapFoJ95JEL06sv4PQ==;
}; };
@@ -1264,7 +1267,7 @@ dhcpd.conf file: @@ -1269,7 +1272,7 @@ dhcpd.conf file:
.PP .PP
.nf .nf
key DHCP_UPDATER { key DHCP_UPDATER {
@ -145,7 +136,7 @@ diff -up dhcp-4.3.0a1/server/dhcpd.conf.5.man dhcp-4.3.0a1/server/dhcpd.conf.5
secret pRP5FapFoJ95JEL06sv4PQ==; secret pRP5FapFoJ95JEL06sv4PQ==;
}; };
@@ -2539,7 +2542,8 @@ statement @@ -2742,7 +2745,8 @@ statement
The \fInext-server\fR statement is used to specify the host address of The \fInext-server\fR statement is used to specify the host address of
the server from which the initial boot file (specified in the the server from which the initial boot file (specified in the
\fIfilename\fR statement) is to be loaded. \fIServer-name\fR should \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should

78
dhcp-option97-pxe-client-id.patch
View File

@ -1,11 +1,11 @@
diff -up dhcp-4.3.1/common/options.c.option97 dhcp-4.3.1/common/options.c diff -up dhcp-4.3.5b1/common/options.c.option97 dhcp-4.3.5b1/common/options.c
--- dhcp-4.3.1/common/options.c.option97 2014-12-17 10:49:23.364257702 +0100 --- dhcp-4.3.5b1/common/options.c.option97 2016-09-12 17:17:13.972691041 +0200
+++ dhcp-4.3.1/common/options.c 2014-12-17 10:49:23.458256518 +0100 +++ dhcp-4.3.5b1/common/options.c 2016-09-12 17:19:17.706790276 +0200
@@ -4270,13 +4270,26 @@ int validate_packet(struct packet *packe @@ -4434,13 +4434,26 @@ int validate_packet(struct packet *packe
"a future version of ISC DHCP will reject this"); "a future version of ISC DHCP will reject this");
} }
} else { } else {
- /* - /*
- * If hlen is 0 we don't have any identifier, we warn the user - * If hlen is 0 we don't have any identifier, we warn the user
- * but continue processing the packet as we can. - * but continue processing the packet as we can.
- */ - */
@ -35,10 +35,10 @@ diff -up dhcp-4.3.1/common/options.c.option97 dhcp-4.3.1/common/options.c
} }
} }
diff -up dhcp-4.3.1/common/tables.c.option97 dhcp-4.3.1/common/tables.c diff -up dhcp-4.3.5b1/common/tables.c.option97 dhcp-4.3.5b1/common/tables.c
--- dhcp-4.3.1/common/tables.c.option97 2014-12-17 10:49:23.365257689 +0100 --- dhcp-4.3.5b1/common/tables.c.option97 2016-09-12 17:17:13.927691005 +0200
+++ dhcp-4.3.1/common/tables.c 2014-12-17 10:49:23.459256505 +0100 +++ dhcp-4.3.5b1/common/tables.c 2016-09-12 17:17:13.972691041 +0200
@@ -197,8 +197,9 @@ static struct option dhcp_options[] = { @@ -196,8 +196,9 @@ static struct option dhcp_options[] = {
/* Defined by RFC 4578 */ /* Defined by RFC 4578 */
{ "pxe-system-type", "S", &dhcp_universe, 93, 1 }, { "pxe-system-type", "S", &dhcp_universe, 93, 1 },
{ "pxe-interface-id", "BBB", &dhcp_universe, 94, 1 }, { "pxe-interface-id", "BBB", &dhcp_universe, 94, 1 },
@ -49,9 +49,9 @@ diff -up dhcp-4.3.1/common/tables.c.option97 dhcp-4.3.1/common/tables.c
{ "uap-servers", "t", &dhcp_universe, 98, 1 }, { "uap-servers", "t", &dhcp_universe, 98, 1 },
#if defined(RFC4776_OPTIONS) #if defined(RFC4776_OPTIONS)
{ "geoconf-civic", "X", &dhcp_universe, 99, 1 }, { "geoconf-civic", "X", &dhcp_universe, 99, 1 },
diff -up dhcp-4.3.1/includes/dhcp.h.option97 dhcp-4.3.1/includes/dhcp.h diff -up dhcp-4.3.5b1/includes/dhcp.h.option97 dhcp-4.3.5b1/includes/dhcp.h
--- dhcp-4.3.1/includes/dhcp.h.option97 2014-12-17 10:49:23.377257538 +0100 --- dhcp-4.3.5b1/includes/dhcp.h.option97 2016-09-12 17:17:13.936691013 +0200
+++ dhcp-4.3.1/includes/dhcp.h 2014-12-17 10:49:23.459256505 +0100 +++ dhcp-4.3.5b1/includes/dhcp.h 2016-09-12 17:17:13.972691041 +0200
@@ -159,6 +159,7 @@ struct dhcp_packet { @@ -159,6 +159,7 @@ struct dhcp_packet {
#define DHO_AUTHENTICATE 90 /* RFC3118, was 210 */ #define DHO_AUTHENTICATE 90 /* RFC3118, was 210 */
#define DHO_CLIENT_LAST_TRANSACTION_TIME 91 #define DHO_CLIENT_LAST_TRANSACTION_TIME 91
@ -60,10 +60,10 @@ diff -up dhcp-4.3.1/includes/dhcp.h.option97 dhcp-4.3.1/includes/dhcp.h
#define DHO_SUBNET_SELECTION 118 /* RFC3011! */ #define DHO_SUBNET_SELECTION 118 /* RFC3011! */
#define DHO_DOMAIN_SEARCH 119 /* RFC3397 */ #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */
#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */ #define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */
diff -up dhcp-4.3.1/server/dhcp.c.option97 dhcp-4.3.1/server/dhcp.c diff -up dhcp-4.3.5b1/server/dhcp.c.option97 dhcp-4.3.5b1/server/dhcp.c
--- dhcp-4.3.1/server/dhcp.c.option97 2014-12-17 10:49:23.409257135 +0100 --- dhcp-4.3.5b1/server/dhcp.c.option97 2016-09-12 17:17:13.947691021 +0200
+++ dhcp-4.3.1/server/dhcp.c 2014-12-17 10:49:23.460256492 +0100 +++ dhcp-4.3.5b1/server/dhcp.c 2016-09-12 17:17:13.973691042 +0200
@@ -196,6 +196,10 @@ dhcp (struct packet *packet) { @@ -221,6 +221,10 @@ dhcp (struct packet *packet) {
oc = lookup_option (&dhcp_universe, packet -> options, oc = lookup_option (&dhcp_universe, packet -> options,
DHO_DHCP_CLIENT_IDENTIFIER); DHO_DHCP_CLIENT_IDENTIFIER);
if (!oc) if (!oc)
@ -74,7 +74,7 @@ diff -up dhcp-4.3.1/server/dhcp.c.option97 dhcp-4.3.1/server/dhcp.c
goto nolease; goto nolease;
memset (&data, 0, sizeof data); memset (&data, 0, sizeof data);
@@ -764,6 +768,9 @@ void dhcprelease (packet, ms_nulltp) @@ -818,6 +822,9 @@ void dhcprelease (packet, ms_nulltp)
oc = lookup_option (&dhcp_universe, packet -> options, oc = lookup_option (&dhcp_universe, packet -> options,
DHO_DHCP_CLIENT_IDENTIFIER); DHO_DHCP_CLIENT_IDENTIFIER);
@ -84,7 +84,7 @@ diff -up dhcp-4.3.1/server/dhcp.c.option97 dhcp-4.3.1/server/dhcp.c
memset (&data, 0, sizeof data); memset (&data, 0, sizeof data);
if (oc && if (oc &&
evaluate_option_cache (&data, packet, (struct lease *)0, evaluate_option_cache (&data, packet, (struct lease *)0,
@@ -1191,6 +1198,9 @@ void dhcpinform (packet, ms_nulltp) @@ -1286,6 +1293,9 @@ void dhcpinform (packet, ms_nulltp)
*/ */
oc = lookup_option(&dhcp_universe, packet->options, oc = lookup_option(&dhcp_universe, packet->options,
DHO_DHCP_CLIENT_IDENTIFIER); DHO_DHCP_CLIENT_IDENTIFIER);
@ -94,7 +94,7 @@ diff -up dhcp-4.3.1/server/dhcp.c.option97 dhcp-4.3.1/server/dhcp.c
memset(&d1, 0, sizeof(d1)); memset(&d1, 0, sizeof(d1));
if (oc && if (oc &&
evaluate_option_cache(&d1, packet, NULL, NULL, evaluate_option_cache(&d1, packet, NULL, NULL,
@@ -2144,6 +2154,9 @@ void ack_lease (packet, lease, offer, wh @@ -2381,6 +2391,9 @@ void ack_lease (packet, lease, offer, wh
can be used. */ can be used. */
oc = lookup_option (&dhcp_universe, packet -> options, oc = lookup_option (&dhcp_universe, packet -> options,
DHO_DHCP_CLIENT_IDENTIFIER); DHO_DHCP_CLIENT_IDENTIFIER);
@ -104,7 +104,7 @@ diff -up dhcp-4.3.1/server/dhcp.c.option97 dhcp-4.3.1/server/dhcp.c
if (oc && if (oc &&
evaluate_option_cache (&d1, packet, lease, evaluate_option_cache (&d1, packet, lease,
(struct client_state *)0, (struct client_state *)0,
@@ -2715,6 +2728,9 @@ void ack_lease (packet, lease, offer, wh @@ -2962,6 +2975,9 @@ void ack_lease (packet, lease, offer, wh
/* Record the uid, if given... */ /* Record the uid, if given... */
oc = lookup_option (&dhcp_universe, packet -> options, oc = lookup_option (&dhcp_universe, packet -> options,
DHO_DHCP_CLIENT_IDENTIFIER); DHO_DHCP_CLIENT_IDENTIFIER);
@ -114,7 +114,7 @@ diff -up dhcp-4.3.1/server/dhcp.c.option97 dhcp-4.3.1/server/dhcp.c
if (oc && if (oc &&
evaluate_option_cache(&d1, packet, lease, NULL, evaluate_option_cache(&d1, packet, lease, NULL,
packet->options, state->options, packet->options, state->options,
@@ -3812,6 +3828,9 @@ int find_lease (struct lease **lp, @@ -4068,6 +4084,9 @@ int find_lease (struct lease **lp,
specified unique client identifier. */ specified unique client identifier. */
oc = lookup_option (&dhcp_universe, packet -> options, oc = lookup_option (&dhcp_universe, packet -> options,
DHO_DHCP_CLIENT_IDENTIFIER); DHO_DHCP_CLIENT_IDENTIFIER);
@ -124,10 +124,10 @@ diff -up dhcp-4.3.1/server/dhcp.c.option97 dhcp-4.3.1/server/dhcp.c
memset (&client_identifier, 0, sizeof client_identifier); memset (&client_identifier, 0, sizeof client_identifier);
if (oc && if (oc &&
evaluate_option_cache (&client_identifier, evaluate_option_cache (&client_identifier,
diff -up dhcp-4.3.1/server/dhcpd.conf.5.option97 dhcp-4.3.1/server/dhcpd.conf.5 diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.option97 dhcp-4.3.5b1/server/dhcpd.conf.5
--- dhcp-4.3.1/server/dhcpd.conf.5.option97 2014-12-17 10:49:23.325258193 +0100 --- dhcp-4.3.5b1/server/dhcpd.conf.5.option97 2016-09-12 17:17:13.885690972 +0200
+++ dhcp-4.3.1/server/dhcpd.conf.5 2014-12-17 10:49:23.461256480 +0100 +++ dhcp-4.3.5b1/server/dhcpd.conf.5 2016-09-12 17:17:13.974691043 +0200
@@ -1559,10 +1559,12 @@ should be a name identifying the host. @@ -1587,10 +1587,12 @@ should be a name identifying the host.
not specified for the host, \fIhostname\fR is used. not specified for the host, \fIhostname\fR is used.
.PP .PP
\fIHost\fR declarations are matched to actual DHCP or BOOTP clients \fIHost\fR declarations are matched to actual DHCP or BOOTP clients
@ -142,7 +142,7 @@ diff -up dhcp-4.3.1/server/dhcpd.conf.5.option97 dhcp-4.3.1/server/dhcpd.conf.5
parameter in the \fIhost\fR declaration to the network hardware parameter in the \fIhost\fR declaration to the network hardware
address supplied by the client. BOOTP clients do not normally address supplied by the client. BOOTP clients do not normally
provide a \fIdhcp-client-identifier\fR, so the hardware address must provide a \fIdhcp-client-identifier\fR, so the hardware address must
@@ -1574,7 +1576,8 @@ to identify hosts. @@ -1602,7 +1604,8 @@ to identify hosts.
.PP .PP
Please be aware that Please be aware that
.B only .B only
@ -152,10 +152,10 @@ diff -up dhcp-4.3.1/server/dhcpd.conf.5.option97 dhcp-4.3.1/server/dhcpd.conf.5
used to match a host declaration, or the \fIhost-identifier option\fR used to match a host declaration, or the \fIhost-identifier option\fR
parameter for DHCPv6 servers. For example, it is not possible to parameter for DHCPv6 servers. For example, it is not possible to
match a host declaration to a \fIhost-name\fR option. This is match a host declaration to a \fIhost-name\fR option. This is
diff -up dhcp-4.3.1/server/dhcpleasequery.c.option97 dhcp-4.3.1/server/dhcpleasequery.c diff -up dhcp-4.3.5b1/server/dhcpleasequery.c.option97 dhcp-4.3.5b1/server/dhcpleasequery.c
--- dhcp-4.3.1/server/dhcpleasequery.c.option97 2014-08-07 00:35:02.000000000 +0200 --- dhcp-4.3.5b1/server/dhcpleasequery.c.option97 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.1/server/dhcpleasequery.c 2014-12-17 10:49:23.457256530 +0100 +++ dhcp-4.3.5b1/server/dhcpleasequery.c 2016-09-12 17:17:13.974691043 +0200
@@ -269,7 +269,7 @@ dhcpleasequery(struct packet *packet, in @@ -273,7 +273,7 @@ dhcpleasequery(struct packet *packet, in
*/ */
memset(&uid, 0, sizeof(uid)); memset(&uid, 0, sizeof(uid));
@ -164,7 +164,7 @@ diff -up dhcp-4.3.1/server/dhcpleasequery.c.option97 dhcp-4.3.1/server/dhcplease
&dhcp_universe, &dhcp_universe,
packet, packet,
NULL, NULL,
@@ -279,8 +279,20 @@ dhcpleasequery(struct packet *packet, in @@ -283,8 +283,20 @@ dhcpleasequery(struct packet *packet, in
packet->options, packet->options,
&global_scope, &global_scope,
DHO_DHCP_CLIENT_IDENTIFIER, DHO_DHCP_CLIENT_IDENTIFIER,
@ -187,10 +187,10 @@ diff -up dhcp-4.3.1/server/dhcpleasequery.c.option97 dhcp-4.3.1/server/dhcplease
snprintf(dbg_info, snprintf(dbg_info,
sizeof(dbg_info), sizeof(dbg_info),
"client-id %s", "client-id %s",
diff -up dhcp-4.3.1/server/failover.c.option97 dhcp-4.3.1/server/failover.c diff -up dhcp-4.3.5b1/server/failover.c.option97 dhcp-4.3.5b1/server/failover.c
--- dhcp-4.3.1/server/failover.c.option97 2014-12-17 10:49:23.413257085 +0100 --- dhcp-4.3.5b1/server/failover.c.option97 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.1/server/failover.c 2014-12-17 10:49:23.462256467 +0100 +++ dhcp-4.3.5b1/server/failover.c 2016-09-12 17:17:13.975691044 +0200
@@ -5878,6 +5878,9 @@ int load_balance_mine (struct packet *pa @@ -5957,6 +5957,9 @@ int load_balance_mine (struct packet *pa
oc = lookup_option(&dhcp_universe, packet->options, oc = lookup_option(&dhcp_universe, packet->options,
DHO_DHCP_CLIENT_IDENTIFIER); DHO_DHCP_CLIENT_IDENTIFIER);
@ -200,10 +200,10 @@ diff -up dhcp-4.3.1/server/failover.c.option97 dhcp-4.3.1/server/failover.c
memset(&ds, 0, sizeof ds); memset(&ds, 0, sizeof ds);
if (oc && if (oc &&
evaluate_option_cache(&ds, packet, NULL, NULL, evaluate_option_cache(&ds, packet, NULL, NULL,
diff -up dhcp-4.3.1/server/mdb.c.option97 dhcp-4.3.1/server/mdb.c diff -up dhcp-4.3.5b1/server/mdb.c.option97 dhcp-4.3.5b1/server/mdb.c
--- dhcp-4.3.1/server/mdb.c.option97 2014-08-07 00:35:03.000000000 +0200 --- dhcp-4.3.5b1/server/mdb.c.option97 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.1/server/mdb.c 2014-12-17 10:49:23.463256455 +0100 +++ dhcp-4.3.5b1/server/mdb.c 2016-09-12 17:17:13.975691044 +0200
@@ -130,8 +130,9 @@ static int find_uid_statement (struct ex @@ -129,8 +129,9 @@ static int find_uid_statement (struct ex
esp -> data.option && esp -> data.option &&
(esp -> data.option -> option -> universe == (esp -> data.option -> option -> universe ==
&dhcp_universe) && &dhcp_universe) &&

56
dhcp-remove-bind.patch
View File

@ -1,6 +1,6 @@
diff -up dhcp-4.3.4/client/Makefile.am.remove-bind dhcp-4.3.4/client/Makefile.am diff -up dhcp-4.3.5b1/client/Makefile.am.remove-bind dhcp-4.3.5b1/client/Makefile.am
--- dhcp-4.3.4/client/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100 --- dhcp-4.3.5b1/client/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.4/client/Makefile.am 2016-04-29 14:13:50.335204352 +0200 +++ dhcp-4.3.5b1/client/Makefile.am 2016-09-12 17:00:22.797902248 +0200
@@ -4,8 +4,6 @@ @@ -4,8 +4,6 @@
# production code. Sadly, we are not there yet. # production code. Sadly, we are not there yet.
SUBDIRS = . tests SUBDIRS = . tests
@ -20,9 +20,9 @@ diff -up dhcp-4.3.4/client/Makefile.am.remove-bind dhcp-4.3.4/client/Makefile.am
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
diff -up dhcp-4.3.4/common/tests/Makefile.am.remove-bind dhcp-4.3.4/common/tests/Makefile.am diff -up dhcp-4.3.5b1/common/tests/Makefile.am.remove-bind dhcp-4.3.5b1/common/tests/Makefile.am
--- dhcp-4.3.4/common/tests/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100 --- dhcp-4.3.5b1/common/tests/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.4/common/tests/Makefile.am 2016-04-29 14:13:50.335204352 +0200 +++ dhcp-4.3.5b1/common/tests/Makefile.am 2016-09-12 17:07:42.168232452 +0200
@@ -1,7 +1,5 @@ @@ -1,7 +1,5 @@
SUBDIRS = . SUBDIRS = .
@ -65,10 +65,10 @@ diff -up dhcp-4.3.4/common/tests/Makefile.am.remove-bind dhcp-4.3.4/common/tests
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
check: $(ATF_TESTS) check: $(ATF_TESTS)
-cp -n $(top_srcdir)/common/tests/Atffile Atffile @if test $(top_srcdir) != ${top_builddir}; then \
diff -up dhcp-4.3.4/configure.ac.remove-bind dhcp-4.3.4/configure.ac diff -up dhcp-4.3.5b1/configure.ac.remove-bind dhcp-4.3.5b1/configure.ac
--- dhcp-4.3.4/configure.ac.remove-bind 2016-03-22 14:19:51.000000000 +0100 --- dhcp-4.3.5b1/configure.ac.remove-bind 2016-08-26 20:24:41.000000000 +0200
+++ dhcp-4.3.4/configure.ac 2016-04-29 14:13:50.335204352 +0200 +++ dhcp-4.3.5b1/configure.ac 2016-09-12 17:00:22.798902249 +0200
@@ -682,20 +682,33 @@ AC_CHECK_MEMBER(struct tpacket_auxdata.t @@ -682,20 +682,33 @@ AC_CHECK_MEMBER(struct tpacket_auxdata.t
BINDDIR= BINDDIR=
BINDSRCDIR= BINDSRCDIR=
@ -130,9 +130,9 @@ diff -up dhcp-4.3.4/configure.ac.remove-bind dhcp-4.3.4/configure.ac
case "$host" in case "$host" in
*-darwin*) *-darwin*)
diff -up dhcp-4.3.4/dhcpctl/Makefile.am.remove-bind dhcp-4.3.4/dhcpctl/Makefile.am diff -up dhcp-4.3.5b1/dhcpctl/Makefile.am.remove-bind dhcp-4.3.5b1/dhcpctl/Makefile.am
--- dhcp-4.3.4/dhcpctl/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100 --- dhcp-4.3.5b1/dhcpctl/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.4/dhcpctl/Makefile.am 2016-04-29 14:13:50.336204352 +0200 +++ dhcp-4.3.5b1/dhcpctl/Makefile.am 2016-09-12 17:00:22.798902249 +0200
@@ -1,5 +1,3 @@ @@ -1,5 +1,3 @@
-BINDLIBDIR = @BINDDIR@/lib -BINDLIBDIR = @BINDDIR@/lib
- -
@ -154,9 +154,9 @@ diff -up dhcp-4.3.4/dhcpctl/Makefile.am.remove-bind dhcp-4.3.4/dhcpctl/Makefile.
- $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \ - $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
- $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a - $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
diff -up dhcp-4.3.4/Makefile.am.remove-bind dhcp-4.3.4/Makefile.am diff -up dhcp-4.3.5b1/Makefile.am.remove-bind dhcp-4.3.5b1/Makefile.am
--- dhcp-4.3.4/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100 --- dhcp-4.3.5b1/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.4/Makefile.am 2016-04-29 14:14:06.863193261 +0200 +++ dhcp-4.3.5b1/Makefile.am 2016-09-12 17:00:22.798902249 +0200
@@ -26,7 +26,13 @@ EXTRA_DIST = RELNOTES LICENSE \ @@ -26,7 +26,13 @@ EXTRA_DIST = RELNOTES LICENSE \
bind/Makefile.in bind/bind.tar.gz bind/version.tmp \ bind/Makefile.in bind/bind.tar.gz bind/version.tmp \
common/tests/Atffile server/tests/Atffile common/tests/Atffile server/tests/Atffile
@ -172,9 +172,9 @@ diff -up dhcp-4.3.4/Makefile.am.remove-bind dhcp-4.3.4/Makefile.am
nobase_include_HEADERS = dhcpctl/dhcpctl.h nobase_include_HEADERS = dhcpctl/dhcpctl.h
diff -up dhcp-4.3.4/omapip/Makefile.am.remove-bind dhcp-4.3.4/omapip/Makefile.am diff -up dhcp-4.3.5b1/omapip/Makefile.am.remove-bind dhcp-4.3.5b1/omapip/Makefile.am
--- dhcp-4.3.4/omapip/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100 --- dhcp-4.3.5b1/omapip/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.4/omapip/Makefile.am 2016-04-29 14:13:50.336204352 +0200 +++ dhcp-4.3.5b1/omapip/Makefile.am 2016-09-12 17:00:22.798902249 +0200
@@ -1,5 +1,3 @@ @@ -1,5 +1,3 @@
-BINDLIBDIR = @BINDDIR@/lib -BINDLIBDIR = @BINDDIR@/lib
- -
@ -190,9 +190,9 @@ diff -up dhcp-4.3.4/omapip/Makefile.am.remove-bind dhcp-4.3.4/omapip/Makefile.am
+svtest_LDADD = libomapi.a \ +svtest_LDADD = libomapi.a \
+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
diff -up dhcp-4.3.4/relay/Makefile.am.remove-bind dhcp-4.3.4/relay/Makefile.am diff -up dhcp-4.3.5b1/relay/Makefile.am.remove-bind dhcp-4.3.5b1/relay/Makefile.am
--- dhcp-4.3.4/relay/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100 --- dhcp-4.3.5b1/relay/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.4/relay/Makefile.am 2016-04-29 14:13:50.336204352 +0200 +++ dhcp-4.3.5b1/relay/Makefile.am 2016-09-12 17:00:22.798902249 +0200
@@ -1,12 +1,9 @@ @@ -1,12 +1,9 @@
-BINDLIBDIR = @BINDDIR@/lib -BINDLIBDIR = @BINDDIR@/lib
- -
@ -207,9 +207,9 @@ diff -up dhcp-4.3.4/relay/Makefile.am.remove-bind dhcp-4.3.4/relay/Makefile.am
man_MANS = dhcrelay.8 man_MANS = dhcrelay.8
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
diff -up dhcp-4.3.4/server/Makefile.am.remove-bind dhcp-4.3.4/server/Makefile.am diff -up dhcp-4.3.5b1/server/Makefile.am.remove-bind dhcp-4.3.5b1/server/Makefile.am
--- dhcp-4.3.4/server/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100 --- dhcp-4.3.5b1/server/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.4/server/Makefile.am 2016-04-29 14:13:50.336204352 +0200 +++ dhcp-4.3.5b1/server/Makefile.am 2016-09-12 17:00:22.798902249 +0200
@@ -4,8 +4,6 @@ @@ -4,8 +4,6 @@
# production code. Sadly, we are not there yet. # production code. Sadly, we are not there yet.
SUBDIRS = . tests SUBDIRS = . tests
@ -233,9 +233,9 @@ diff -up dhcp-4.3.4/server/Makefile.am.remove-bind dhcp-4.3.4/server/Makefile.am
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
diff -up dhcp-4.3.4/server/tests/Makefile.am.remove-bind dhcp-4.3.4/server/tests/Makefile.am diff -up dhcp-4.3.5b1/server/tests/Makefile.am.remove-bind dhcp-4.3.5b1/server/tests/Makefile.am
--- dhcp-4.3.4/server/tests/Makefile.am.remove-bind 2016-03-22 14:16:51.000000000 +0100 --- dhcp-4.3.5b1/server/tests/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200
+++ dhcp-4.3.4/server/tests/Makefile.am 2016-04-29 14:13:50.336204352 +0200 +++ dhcp-4.3.5b1/server/tests/Makefile.am 2016-09-12 17:00:22.799902249 +0200
@@ -1,9 +1,7 @@ @@ -1,9 +1,7 @@
SUBDIRS = . SUBDIRS = .

16
dhcp.spec
View File

@ -8,17 +8,18 @@
%global dhcpconfdir %{_sysconfdir}/dhcp %global dhcpconfdir %{_sysconfdir}/dhcp
#%%global prever b1 %global prever b1
%global patchver P1 #%%global patchver P1
#%%global VERSION %%{version}%%{prever}
#%%global VERSION %%{version}-%%{patchver} #%%global VERSION %%{version}-%%{patchver}
%global VERSION %{version} #%%global VERSION %%{version}
%global VERSION %{version}%{prever}
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.3.4 Version: 4.3.5
Release: 3%{?dist} Release: 0.1%{prever}%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was. # that's why it is at 12 now. It should have never been used, but it was.
@ -661,6 +662,9 @@ done
%doc doc/html/ %doc doc/html/
%changelog %changelog
* Mon Sep 12 2016 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.5-0.1b1
- 4.3.5b1
* Wed Aug 03 2016 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.4-3 * Wed Aug 03 2016 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.4-3
- [dhclient] rename -R option to --request-options (#1357947) - [dhclient] rename -R option to --request-options (#1357947)
- [dhclient] rename -timeout option to --timeout - [dhclient] rename -timeout option to --timeout

2
sources
View File

@ -1 +1 @@
0138319fe2b788cf4bdf34fbeaf9ff54 dhcp-4.3.4.tar.gz b9dee10cd7ab9977529f84ddc711a038 dhcp-4.3.5b1.tar.gz