Create /var/lib/dhcpd through systemd-tmpfiles

Keama is provided by Kea's sub-package kea-keama.

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -3,3 +3,10 @@
 /dhcp-4.3.6b1.tar.gz
 /dhcp-4.3.6.tar.gz
 /dhcp-4.4.1.tar.gz
+/dhcp-4.4.2b1.tar.gz
+/dhcp-4.4.2-P1.tar.gz
+/dhcp-4.4.2-P1.tar.gz.asc
+/dhcp-4.4.3.tar.gz
+/dhcp-4.4.3.tar.gz.asc
+/dhcp-4.4.3-P1.tar.gz
+/dhcp-4.4.3-P1.tar.gz.asc

0001-change-bug-url.patch

@@ -1,15 +1,14 @@
-From 31ef6eadb15c3773b81256a8617eccc7657fd2fd Mon Sep 17 00:00:00 2001
+From 5e9162c5ad7aa98f7f673ac7a7f46905ba2deea4 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:09:57 +0100
-Subject: [PATCH 01/21] change bug url
-Cc: pzhukov@redhat.com
+Subject: [PATCH 01/28] change bug url
 
 ---
  omapip/errwarn.c | 47 ++++++++++++++++++++++++++++++++++++++++++-----
  1 file changed, 42 insertions(+), 5 deletions(-)
 
 diff --git a/omapip/errwarn.c b/omapip/errwarn.c
-index e30f8a0..09a3004 100644
+index 38dd9c5..d88e392 100644
 --- a/omapip/errwarn.c
 +++ b/omapip/errwarn.c
 @@ -48,6 +48,41 @@ void (*log_cleanup) (void);
@@ -74,5 +73,5 @@ index e30f8a0..09a3004 100644
    log_error ("exiting.");
  
 -- 
-2.14.5
+2.35.1
 

0002-additional-dhclient-options.patch

@@ -1,23 +1,22 @@
-From 3a86bcb58a7c081df22b6f55e973d5e3c99065d8 Mon Sep 17 00:00:00 2001
+From af18c830fe55f6be0b89997a36b611d981e3c25d Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:19:47 +0100
-Subject: [PATCH 02/21] additional dhclient options
-Cc: pzhukov@redhat.com
+Subject: [PATCH 02/28] additional dhclient options
 
 ---
  client/clparse.c    |  10 +-
- client/dhclient.8   |  27 ++++++
- client/dhclient.c   | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ client/dhclient.8   |  27 +++++
+ client/dhclient.c   | 271 +++++++++++++++++++++++++++++++++++++++++++-
  common/conflex.c    |   2 +
  includes/dhcpd.h    |   3 +
- includes/dhctoken.h |   1 +
- 6 files changed, 308 insertions(+), 6 deletions(-)
+ includes/dhctoken.h |   3 +-
+ 6 files changed, 309 insertions(+), 7 deletions(-)
 
 diff --git a/client/clparse.c b/client/clparse.c
-index eaf48a8..7212e3a 100644
+index 74ca499..bb63825 100644
 --- a/client/clparse.c
 +++ b/client/clparse.c
-@@ -189,6 +189,7 @@ isc_result_t read_client_conf ()
+@@ -192,6 +192,7 @@ isc_result_t read_client_conf ()
  	/* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)
  	 */
  	top_level_config.requested_lease = 7200;
@@ -25,7 +24,7 @@ index eaf48a8..7212e3a 100644
  
  	group_allocate (&top_level_config.on_receipt, MDL);
  	if (!top_level_config.on_receipt)
-@@ -394,7 +395,8 @@ void read_client_leases ()
+@@ -397,7 +398,8 @@ void read_client_leases ()
  	interface-declaration |
  	LEASE client-lease-statement |
  	ALIAS client-lease-statement |
@@ -35,7 +34,7 @@ index eaf48a8..7212e3a 100644
  
  void parse_client_statement (cfile, ip, config)
  	struct parse *cfile;
-@@ -817,6 +819,12 @@ void parse_client_statement (cfile, ip, config)
+@@ -820,6 +822,12 @@ void parse_client_statement (cfile, ip, config)
  		parse_lease_id_format(cfile);
  		break;
  
@@ -49,10 +48,10 @@ index eaf48a8..7212e3a 100644
  	      default:
  		lose = 0;
 diff --git a/client/dhclient.8 b/client/dhclient.8
-index ebc750f..6d7fbdb 100644
+index 861ff56..5029dac 100644
 --- a/client/dhclient.8
 +++ b/client/dhclient.8
-@@ -134,6 +134,33 @@ dhclient - Dynamic Host Configuration Protocol Client
+@@ -135,6 +135,33 @@ dhclient - Dynamic Host Configuration Protocol Client
  .B -w
  ]
  [
@@ -87,7 +86,7 @@ index ebc750f..6d7fbdb 100644
  .I seconds
  ]
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 825ab00..26a333c 100644
+index 46dc3a7..6c1c09a 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
 @@ -41,6 +41,12 @@
@@ -103,7 +102,7 @@ index 825ab00..26a333c 100644
  TIME default_lease_time = 43200; /* 12 hours... */
  TIME max_lease_time = 86400; /* 24 hours... */
  
-@@ -110,6 +116,10 @@ char *mockup_relay = NULL;
+@@ -113,6 +119,10 @@ char *mockup_relay = NULL;
  
  char *progname = NULL;
  
@@ -114,7 +113,7 @@ index 825ab00..26a333c 100644
  void run_stateless(int exit_mode, u_int16_t port);
  
  static isc_result_t write_duid(struct data_string *duid);
-@@ -183,8 +193,12 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s";
+@@ -189,8 +199,12 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s";
  "                [-s server-addr] [-cf config-file]\n" \
  "                [-df duid-file] [-lf lease-file]\n" \
  "                [-pf pid-file] [--no-pid] [-e VAR=val]\n" \
@@ -129,7 +128,7 @@ index 825ab00..26a333c 100644
  #define DHCLIENT_USAGEH "{--version|--help|-h}"
  
  static void
-@@ -243,6 +257,16 @@ main(int argc, char **argv) {
+@@ -249,6 +263,16 @@ main(int argc, char **argv) {
  #else
  	progname = argv[0];
  #endif
@@ -146,7 +145,7 @@ index 825ab00..26a333c 100644
  	/* Initialize client globals. */
  	memset(&default_duid, 0, sizeof(default_duid));
  
-@@ -558,6 +582,89 @@ main(int argc, char **argv) {
+@@ -564,6 +588,89 @@ main(int argc, char **argv) {
  			std_dhcid = 1;
  		} else if (!strcmp(argv[i], "-v")) {
  			quiet = 0;
@@ -236,7 +235,7 @@ index 825ab00..26a333c 100644
  		} else if (argv[i][0] == '-') {
  			usage("Unknown command: %s", argv[i]);
  		} else if (interfaces_requested < 0) {
-@@ -754,6 +861,156 @@ main(int argc, char **argv) {
+@@ -760,6 +867,156 @@ main(int argc, char **argv) {
  	/* Parse the dhclient.conf file. */
  	read_client_conf();
  
@@ -393,7 +392,7 @@ index 825ab00..26a333c 100644
  	/* Parse the lease database. */
  	read_client_leases();
  
-@@ -3226,7 +3483,8 @@ void make_discover (client, lease)
+@@ -3472,7 +3729,8 @@ void make_discover (client, lease)
  	client -> packet.xid = random ();
  	client -> packet.secs = 0; /* filled in by send_discover. */
  
@@ -403,7 +402,7 @@ index 825ab00..26a333c 100644
  		client -> packet.flags = 0;
  	else
  		client -> packet.flags = htons (BOOTP_BROADCAST);
-@@ -3311,7 +3569,9 @@ void make_request (client, lease)
+@@ -3557,7 +3815,9 @@ void make_request (client, lease)
  	} else {
  		memset (&client -> packet.ciaddr, 0,
  			sizeof client -> packet.ciaddr);
@@ -414,7 +413,7 @@ index 825ab00..26a333c 100644
  			client -> packet.flags = 0;
  		else
  			client -> packet.flags = htons (BOOTP_BROADCAST);
-@@ -3374,7 +3634,8 @@ void make_decline (client, lease)
+@@ -3620,7 +3880,8 @@ void make_decline (client, lease)
  	client -> packet.hops = 0;
  	client -> packet.xid = client -> xid;
  	client -> packet.secs = 0; /* Filled in by send_request. */
@@ -425,7 +424,7 @@ index 825ab00..26a333c 100644
  	else
  		client -> packet.flags = htons (BOOTP_BROADCAST);
 diff --git a/common/conflex.c b/common/conflex.c
-index 045b655..71c0bf5 100644
+index 8b01dfb..1fa2be3 100644
 --- a/common/conflex.c
 +++ b/common/conflex.c
 @@ -832,6 +832,8 @@ intern(char *atom, enum dhcp_token dfv) {
@@ -438,10 +437,10 @@ index 045b655..71c0bf5 100644
  	      case 'c':
  		if (!strcasecmp(atom + 1, "ase"))
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 5930e6a..018fa34 100644
+index f68b228..3b2e2ca 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
-@@ -1269,6 +1269,9 @@ struct client_config {
+@@ -1284,6 +1284,9 @@ struct client_config {
  
  	int lease_id_format;		/* format for IDs in lease file,
  					   TOKEN_OCTAL or TOKEN_HEX */
@@ -452,17 +451,19 @@ index 5930e6a..018fa34 100644
  
  /* Per-interface state used in the dhcp client... */
 diff --git a/includes/dhctoken.h b/includes/dhctoken.h
-index 5920f4f..7e7215a 100644
+index e6d125f..6daa422 100644
 --- a/includes/dhctoken.h
 +++ b/includes/dhctoken.h
-@@ -377,6 +377,7 @@ enum dhcp_token {
+@@ -377,7 +377,8 @@ enum dhcp_token {
  	TOKEN_HEX = 677,
  	TOKEN_OCTAL = 678,
- 	KEY_ALGORITHM = 679
-+        BOOTP_BROADCAST_ALWAYS = 680
+ 	KEY_ALGORITHM = 679,
+-	DISCONNECT = 680
++	BOOTP_BROADCAST_ALWAYS = 680,
++	DISCONNECT = 681
  };
  
  #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\
 -- 
-2.14.5
+2.35.1
 

0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch

@@ -1,18 +1,17 @@
-From 692fd8b16ef6f12a57596351e930c65c68597bac Mon Sep 17 00:00:00 2001
+From be8f73c399c0f89192e57453db153aaa48fcbb2e Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:21:14 +0100
-Subject: [PATCH 03/21] Handle releasing interfaces requested by /sbin/ifup
-Cc: pzhukov@redhat.com
+Subject: [PATCH 03/28] Handle releasing interfaces requested by /sbin/ifup
 
 ---
- client/dhclient.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ client/dhclient.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 72 insertions(+)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 26a333c..2a2e9e6 100644
+index 6c1c09a..07679a7 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -787,9 +787,81 @@ main(int argc, char **argv) {
+@@ -793,9 +793,81 @@ main(int argc, char **argv) {
  				}
  			}
  			fclose(pidfd);
@@ -95,5 +94,5 @@ index 26a333c..2a2e9e6 100644
  		log_info("%s %s", message, PACKAGE_VERSION);
  		log_info(copyright);
 -- 
-2.14.5
+2.35.1
 

0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch

@@ -1,9 +1,8 @@
-From 9dc17d6086bf140efda84ce434664b60ce2191a1 Mon Sep 17 00:00:00 2001
+From 0a640394cb6f4a97fb87e53f049fba23523035c8 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:22:41 +0100
-Subject: [PATCH 04/21] Support unicast BOOTP for IBM pSeries systems (and
+Subject: [PATCH 04/28] Support unicast BOOTP for IBM pSeries systems (and
  maybe others)
-Cc: pzhukov@redhat.com
 
 ---
  server/bootp.c | 12 +++++++++++-
@@ -11,7 +10,7 @@ Cc: pzhukov@redhat.com
  2 files changed, 37 insertions(+), 8 deletions(-)
 
 diff --git a/server/bootp.c b/server/bootp.c
-index 26a7607..2212f31 100644
+index 919d483..338aac0 100644
 --- a/server/bootp.c
 +++ b/server/bootp.c
 @@ -52,6 +52,7 @@ void bootp (packet)
@@ -48,10 +47,10 @@ index 26a7607..2212f31 100644
  	/* If it comes from a client that already knows its address
  	   and is not requesting a broadcast response, and we can
 diff --git a/server/dhcp.c b/server/dhcp.c
-index 6f3a91f..20f2a62 100644
+index 0b261c2..ae805a6 100644
 --- a/server/dhcp.c
 +++ b/server/dhcp.c
-@@ -5224,6 +5224,7 @@ int locate_network (packet)
+@@ -5332,6 +5332,7 @@ int locate_network (packet)
  	struct data_string data;
  	struct subnet *subnet = (struct subnet *)0;
  	struct option_cache *oc;
@@ -59,7 +58,7 @@ index 6f3a91f..20f2a62 100644
  
  #if defined(DHCPv6) && defined(DHCP4o6)
  	if (dhcpv4_over_dhcpv6 && (packet->dhcp4o6_response != NULL)) {
-@@ -5245,12 +5246,24 @@ int locate_network (packet)
+@@ -5353,12 +5354,24 @@ int locate_network (packet)
  	   from the interface, if there is one.   If not, fail. */
  	if (!oc && !packet -> raw -> giaddr.s_addr) {
  		if (packet -> interface -> shared_network) {
@@ -89,7 +88,7 @@ index 6f3a91f..20f2a62 100644
  	}
  
  	/* If there's an option indicating link connection, and it's valid,
-@@ -5277,7 +5290,10 @@ int locate_network (packet)
+@@ -5384,7 +5397,10 @@ int locate_network (packet)
  		data_string_forget (&data, MDL);
  	} else {
  		ia.len = 4;
@@ -101,7 +100,7 @@ index 6f3a91f..20f2a62 100644
  	}
  
  	/* If we know the subnet on which the IP address lives, use it. */
-@@ -5285,7 +5301,10 @@ int locate_network (packet)
+@@ -5392,7 +5408,10 @@ int locate_network (packet)
  		shared_network_reference (&packet -> shared_network,
  					  subnet -> shared_network, MDL);
  		subnet_dereference (&subnet, MDL);
@@ -114,5 +113,5 @@ index 6f3a91f..20f2a62 100644
  
  	/* Otherwise, fail. */
 -- 
-2.14.5
+2.35.1
 

0005-Change-default-requested-options.patch

@@ -1,8 +1,7 @@
-From ac21c8b966620cbe79be3508c024ae30f93d6266 Mon Sep 17 00:00:00 2001
+From f994c4d208a8fe88cbf78d4374c8d44793f0598e Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:24:24 +0100
-Subject: [PATCH 05/21] Change default requested options
-Cc: pzhukov@redhat.com
+Subject: [PATCH 05/28] Change default requested options
 
 Add NIS domain, NIS servers, NTP servers, interface-mtu and domain-search
 to the list of default requested DHCP options
@@ -11,7 +10,7 @@ to the list of default requested DHCP options
  1 file changed, 26 insertions(+), 1 deletion(-)
 
 diff --git a/client/clparse.c b/client/clparse.c
-index 7212e3a..39b95a0 100644
+index bb63825..e63ea08 100644
 --- a/client/clparse.c
 +++ b/client/clparse.c
 @@ -31,7 +31,7 @@
@@ -23,7 +22,7 @@ index 7212e3a..39b95a0 100644
  /* There can be 2 extra requested options for DHCPv4-over-DHCPv6. */
  struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 2 + 1];
  
-@@ -116,6 +116,31 @@ isc_result_t read_client_conf ()
+@@ -119,6 +119,31 @@ isc_result_t read_client_conf ()
  	option_code_hash_lookup(&default_requested_options[8],
  				dhcpv6_universe.code_hash, &code, 0, MDL);
  
@@ -56,5 +55,5 @@ index 7212e3a..39b95a0 100644
  		if (default_requested_options[code] == NULL)
  			log_fatal("Unable to find option definition for "
 -- 
-2.14.5
+2.35.1
 

0006-Various-man-page-only-fixes.patch

@@ -1,8 +1,7 @@
-From dd3053e6f45ac1f149869b7ded3f539d6c046114 Mon Sep 17 00:00:00 2001
+From d359a7dc30e0423f9b90129291538cad1ee6a6d9 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:25:53 +0100
-Subject: [PATCH 06/21] Various man-page-only fixes
-Cc: pzhukov@redhat.com
+Subject: [PATCH 06/28] Various man-page-only fixes
 
 ---
  client/dhclient-script.8 | 22 +++++++++++++++++++++-
@@ -12,7 +11,7 @@ Cc: pzhukov@redhat.com
  4 files changed, 58 insertions(+), 7 deletions(-)
 
 diff --git a/client/dhclient-script.8 b/client/dhclient-script.8
-index 3553afd..0db5516 100644
+index 5e5bd3d..37ecdc5 100644
 --- a/client/dhclient-script.8
 +++ b/client/dhclient-script.8
 @@ -43,7 +43,7 @@ customizations are needed, they should be possible using the enter and
@@ -52,7 +51,7 @@ index 3553afd..0db5516 100644
  When dhclient needs to invoke the client configuration script, it
  defines a set of variables in the environment, and then invokes
 diff --git a/client/dhclient.conf.5 b/client/dhclient.conf.5
-index fa3b908..566a881 100644
+index dbe6f7e..8bac980 100644
 --- a/client/dhclient.conf.5
 +++ b/client/dhclient.conf.5
 @@ -228,7 +228,8 @@ responding to the client send the client its values for the specified
@@ -84,10 +83,10 @@ index fa3b908..566a881 100644
  .SH SAMPLE
  The following configuration file was used on a laptop running NetBSD
 diff --git a/common/dhcp-options.5 b/common/dhcp-options.5
-index 33d4804..d9e1197 100644
+index 51f80f7..a784b32 100644
 --- a/common/dhcp-options.5
 +++ b/common/dhcp-options.5
-@@ -1068,6 +1068,21 @@ classless IP routing - it does not include a subnet mask.  Since
+@@ -1075,6 +1075,21 @@ classless IP routing - it does not include a subnet mask.  Since
  classless IP routing is now the most widely deployed routing standard,
  this option is virtually useless, and is not implemented by any of the
  popular DHCP clients, for example the Microsoft DHCP client.
@@ -110,7 +109,7 @@ index 33d4804..d9e1197 100644
  .PP
  .nf
 diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
-index 17330d4..89b5540 100644
+index 691e5dd..b7e79ea 100644
 --- a/server/dhcpd.conf.5
 +++ b/server/dhcpd.conf.5
 @@ -527,6 +527,9 @@ pool {
@@ -153,7 +152,7 @@ index 17330d4..89b5540 100644
    secret pRP5FapFoJ95JEL06sv4PQ==;
  };
  
-@@ -2912,7 +2915,8 @@ statement
+@@ -2918,7 +2921,8 @@ statement
  The \fInext-server\fR statement is used to specify the host address of
  the server from which the initial boot file (specified in the
  \fIfilename\fR statement) is to be loaded.  \fIServer-name\fR should
@@ -164,5 +163,5 @@ index 17330d4..89b5540 100644
  .PP
  The
 -- 
-2.14.5
+2.35.1
 

0007-Change-paths-to-conform-to-our-standards.patch

@@ -1,8 +1,7 @@
-From bf4e3f1d181b5b4e6225fe5726c02420157433cc Mon Sep 17 00:00:00 2001
+From d8da92991d93a3d1c9fc474696aee25b99623c42 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:26:34 +0100
-Subject: [PATCH 07/21] Change paths to conform to our standards
-Cc: pzhukov@redhat.com
+Subject: [PATCH 07/28] Change paths to conform to our standards
 
 ---
  doc/examples/dhcpd-dhcpv6.conf | 2 +-
@@ -23,10 +22,10 @@ index 448a6a6..2357824 100644
  # Static definition (must be global)
  host myclient {
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 018fa34..3632a6b 100644
+index 3b2e2ca..4a57002 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
-@@ -1545,7 +1545,7 @@ typedef unsigned char option_mask [16];
+@@ -1561,7 +1561,7 @@ typedef unsigned char option_mask [16];
  #else /* !DEBUG */
  
  #ifndef _PATH_DHCPD_CONF
@@ -35,7 +34,7 @@ index 018fa34..3632a6b 100644
  #endif /* DEBUG */
  
  #ifndef _PATH_DHCPD_DB
-@@ -1567,11 +1567,11 @@ typedef unsigned char option_mask [16];
+@@ -1583,11 +1583,11 @@ typedef unsigned char option_mask [16];
  #endif /* DEBUG */
  
  #ifndef _PATH_DHCLIENT_CONF
@@ -50,5 +49,5 @@ index 018fa34..3632a6b 100644
  
  #ifndef _PATH_DHCLIENT_PID
 -- 
-2.14.5
+2.35.1
 

0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch

@@ -1,9 +1,8 @@
-From 26d34bc8e55c39ef84d580b6453c65b5cbeab8ff Mon Sep 17 00:00:00 2001
+From 39ce1ca26128f4a5d018a567157320ba1f68f4ea Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:27:18 +0100
-Subject: [PATCH 08/21] Make sure all open file descriptors are closed-on-exec
+Subject: [PATCH 08/28] Make sure all open file descriptors are closed-on-exec
  for SELinux
-Cc: pzhukov@redhat.com
 
 ISC-bug: #19148
 ---
@@ -23,10 +22,10 @@ ISC-bug: #19148
  13 files changed, 40 insertions(+), 40 deletions(-)
 
 diff --git a/client/clparse.c b/client/clparse.c
-index 39b95a0..44387ed 100644
+index e63ea08..902b523 100644
 --- a/client/clparse.c
 +++ b/client/clparse.c
-@@ -288,7 +288,7 @@ int read_client_conf_file (const char *name, struct interface_info *ip,
+@@ -291,7 +291,7 @@ int read_client_conf_file (const char *name, struct interface_info *ip,
  	int token;
  	isc_result_t status;
  
@@ -35,7 +34,7 @@ index 39b95a0..44387ed 100644
  		return uerr2isc (errno);
  
  	cfile = NULL;
-@@ -364,7 +364,7 @@ void read_client_leases ()
+@@ -367,7 +367,7 @@ void read_client_leases ()
  
  	/* Open the lease file.   If we can't open it, just return -
  	   we can safely trust the server to remember our state. */
@@ -45,10 +44,10 @@ index 39b95a0..44387ed 100644
  
  	cfile = NULL;
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 2a2e9e6..a86ab9e 100644
+index 07679a7..aefc119 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -273,11 +273,11 @@ main(int argc, char **argv) {
+@@ -279,11 +279,11 @@ main(int argc, char **argv) {
  	/* Make sure that file descriptors 0 (stdin), 1, (stdout), and
  	   2 (stderr) are open. To do this, we assume that when we
  	   open a file the lowest available file descriptor is used. */
@@ -63,7 +62,7 @@ index 2a2e9e6..a86ab9e 100644
  	if (fd == 2)
  		log_perror = 0; /* No sense logging to /dev/null. */
  	else if (fd != -1)
-@@ -765,7 +765,7 @@ main(int argc, char **argv) {
+@@ -771,7 +771,7 @@ main(int argc, char **argv) {
  		long temp;
  		int e;
  
@@ -72,7 +71,7 @@ index 2a2e9e6..a86ab9e 100644
  			e = fscanf(pidfd, "%ld\n", &temp);
  			oldpid = (pid_t)temp;
  
-@@ -820,7 +820,7 @@ main(int argc, char **argv) {
+@@ -826,7 +826,7 @@ main(int argc, char **argv) {
  					strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
  					sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
  
@@ -81,7 +80,7 @@ index 2a2e9e6..a86ab9e 100644
  						e = fscanf(pidfd, "%ld\n", &temp);
  						oldpid = (pid_t)temp;
  
-@@ -845,7 +845,7 @@ main(int argc, char **argv) {
+@@ -851,7 +851,7 @@ main(int argc, char **argv) {
  		int dhc_running = 0;
  		char procfn[256] = "";
  
@@ -90,7 +89,7 @@ index 2a2e9e6..a86ab9e 100644
  			if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
  				snprintf(procfn,256,"/proc/%u",dhcpid);
  				dhc_running = (access(procfn, F_OK) == 0);
-@@ -3808,7 +3808,7 @@ void rewrite_client_leases ()
+@@ -4054,7 +4054,7 @@ void rewrite_client_leases ()
  
  	if (leaseFile != NULL)
  		fclose (leaseFile);
@@ -99,7 +98,7 @@ index 2a2e9e6..a86ab9e 100644
  	if (leaseFile == NULL) {
  		log_error ("can't create %s: %m", path_dhclient_db);
  		return;
-@@ -4003,7 +4003,7 @@ write_duid(struct data_string *duid)
+@@ -4249,7 +4249,7 @@ write_duid(struct data_string *duid)
  		return DHCP_R_INVALIDARG;
  
  	if (leaseFile == NULL) {	/* XXX? */
@@ -108,7 +107,7 @@ index 2a2e9e6..a86ab9e 100644
  		if (leaseFile == NULL) {
  			log_error("can't create %s: %m", path_dhclient_db);
  			return ISC_R_IOERROR;
-@@ -4207,7 +4207,7 @@ int write_client_lease (client, lease, rewrite, makesure)
+@@ -4453,7 +4453,7 @@ int write_client_lease (client, lease, rewrite, makesure)
  		return 1;
  
  	if (leaseFile == NULL) {	/* XXX */
@@ -117,7 +116,7 @@ index 2a2e9e6..a86ab9e 100644
  		if (leaseFile == NULL) {
  			log_error ("can't create %s: %m", path_dhclient_db);
  			return 0;
-@@ -4786,9 +4786,9 @@ void detach ()
+@@ -5039,9 +5039,9 @@ void detach ()
  	(void) close(2);
  
  	/* Reopen them on /dev/null. */
@@ -130,7 +129,7 @@ index 2a2e9e6..a86ab9e 100644
  
  	write_client_pid_file ();
  
-@@ -4806,14 +4806,14 @@ void write_client_pid_file ()
+@@ -5059,14 +5059,14 @@ void write_client_pid_file ()
  		return;
  	}
  
@@ -148,7 +147,7 @@ index 2a2e9e6..a86ab9e 100644
  		close(pfdesc);
  		log_error ("Can't fdopen %s: %m", path_dhclient_pid);
 diff --git a/common/bpf.c b/common/bpf.c
-index 16076fe..67b6d64 100644
+index 0bffcbf..d2a0549 100644
 --- a/common/bpf.c
 +++ b/common/bpf.c
 @@ -94,7 +94,7 @@ int if_register_bpf (info)
@@ -161,20 +160,20 @@ index 16076fe..67b6d64 100644
  			if (errno == EBUSY) {
  				continue;
 diff --git a/common/dlpi.c b/common/dlpi.c
-index 3990bf1..a941258 100644
+index f2332c0..bf6e21f 100644
 --- a/common/dlpi.c
 +++ b/common/dlpi.c
 @@ -817,7 +817,7 @@ dlpiopen(const char *ifname) {
  	}
  	*dp = '\0';
- 	
+ 
 -	return open (devname, O_RDWR, 0);
 +	return open (devname, O_RDWR | O_CLOEXEC, 0);
  }
  
  /*
 diff --git a/common/nit.c b/common/nit.c
-index d822c15..a9132bc 100644
+index ba62488..4ebfa4a 100644
 --- a/common/nit.c
 +++ b/common/nit.c
 @@ -75,7 +75,7 @@ int if_register_nit (info)
@@ -187,7 +186,7 @@ index d822c15..a9132bc 100644
  		log_fatal ("Can't open NIT device for %s: %m", info -> name);
  
 diff --git a/common/resolv.c b/common/resolv.c
-index a01f520..b209e3f 100644
+index 5fd683f..3535f3e 100644
 --- a/common/resolv.c
 +++ b/common/resolv.c
 @@ -43,7 +43,7 @@ void read_resolv_conf (parse_time)
@@ -200,7 +199,7 @@ index a01f520..b209e3f 100644
  		return;
  	}
 diff --git a/common/upf.c b/common/upf.c
-index 9785879..e0a524f 100644
+index 37e5cb2..b7c0649 100644
 --- a/common/upf.c
 +++ b/common/upf.c
 @@ -71,7 +71,7 @@ int if_register_upf (info)
@@ -213,7 +212,7 @@ index 9785879..e0a524f 100644
  			if (errno == EBUSY) {
  				continue;
 diff --git a/omapip/trace.c b/omapip/trace.c
-index 45bd508..5ea7486 100644
+index dc9185f..a605d18 100644
 --- a/omapip/trace.c
 +++ b/omapip/trace.c
 @@ -136,10 +136,10 @@ isc_result_t trace_begin (const char *filename,
@@ -239,10 +238,10 @@ index 45bd508..5ea7486 100644
  		log_error("Can't open tracefile %s: %m", filename);
  		return;
 diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index d8caaaf..ea1be18 100644
+index 946ef1b..a7b1286 100644
 --- a/relay/dhcrelay.c
 +++ b/relay/dhcrelay.c
-@@ -296,11 +296,11 @@ main(int argc, char **argv) {
+@@ -305,11 +305,11 @@ main(int argc, char **argv) {
  	/* Make sure that file descriptors 0(stdin), 1,(stdout), and
  	   2(stderr) are open. To do this, we assume that when we
  	   open a file the lowest available file descriptor is used. */
@@ -257,7 +256,7 @@ index d8caaaf..ea1be18 100644
  	if (fd == 2)
  		log_perror = 0; /* No sense logging to /dev/null. */
  	else if (fd != -1)
-@@ -776,13 +776,13 @@ main(int argc, char **argv) {
+@@ -800,13 +800,13 @@ main(int argc, char **argv) {
  		/* Create the pid file. */
  		if (no_pid_file == ISC_FALSE) {
  			pfdesc = open(path_dhcrelay_pid,
@@ -274,7 +273,7 @@ index d8caaaf..ea1be18 100644
  					log_error("Can't fdopen %s: %m",
  						  path_dhcrelay_pid);
 diff --git a/server/confpars.c b/server/confpars.c
-index d2cedfe..2743979 100644
+index 103af1e..5a6396b 100644
 --- a/server/confpars.c
 +++ b/server/confpars.c
 @@ -118,7 +118,7 @@ isc_result_t read_conf_file (const char *filename, struct group *group,
@@ -287,7 +286,7 @@ index d2cedfe..2743979 100644
  			log_error ("Can't open lease database %s: %m --",
  				   path_dhcpd_db);
 diff --git a/server/db.c b/server/db.c
-index 67e6cc1..6181528 100644
+index cecbf6b..4243a92 100644
 --- a/server/db.c
 +++ b/server/db.c
 @@ -1154,7 +1154,7 @@ int new_lease_file (int test_mode)
@@ -309,7 +308,7 @@ index 67e6cc1..6181528 100644
  		close(db_fd);
  		goto fdfail;
 diff --git a/server/dhcpd.c b/server/dhcpd.c
-index 55ffae7..530a923 100644
+index 3522889..845d0cc 100644
 --- a/server/dhcpd.c
 +++ b/server/dhcpd.c
 @@ -300,11 +300,11 @@ main(int argc, char **argv) {
@@ -350,10 +349,10 @@ index 55ffae7..530a923 100644
  
         		IGNORE_RET (chdir("/"));
 diff --git a/server/ldap.c b/server/ldap.c
-index 5126d24..555545c 100644
+index e3e48f4..1a68936 100644
 --- a/server/ldap.c
 +++ b/server/ldap.c
-@@ -1446,7 +1446,7 @@ ldap_start (void)
+@@ -1447,7 +1447,7 @@ ldap_start (void)
  
    if (ldap_debug_file != NULL && ldap_debug_fd == -1)
      {
@@ -363,5 +362,5 @@ index 5126d24..555545c 100644
          log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file,
                     strerror (errno));
 -- 
-2.14.5
+2.35.1
 

0009-Fix-garbage-in-format-string-error.patch

@@ -1,8 +1,7 @@
-From 9ffd73d22b1337aeedef751afd03822cc0a15014 Mon Sep 17 00:00:00 2001
+From cfe6414644b68d5b6b5ba150bf57cff0a709a59e Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:28:13 +0100
-Subject: [PATCH 09/21] Fix 'garbage in format string' error
-Cc: pzhukov@redhat.com
+Subject: [PATCH 09/28] Fix 'garbage in format string' error
 
 RHBZ: 450042
 ---
@@ -10,10 +9,10 @@ RHBZ: 450042
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/common/tables.c b/common/tables.c
-index c1aa214..d2294c0 100644
+index be37737..ce12fcd 100644
 --- a/common/tables.c
 +++ b/common/tables.c
-@@ -215,7 +215,7 @@ static struct option dhcp_options[] = {
+@@ -222,7 +222,7 @@ static struct option dhcp_options[] = {
  	{ "name-service-search", "Sa",		&dhcp_universe, 117, 1 },
  #endif
  	{ "subnet-selection", "I",		&dhcp_universe, 118, 1 },
@@ -23,5 +22,5 @@ index c1aa214..d2294c0 100644
  	{ "vivso", "Evendor.",			&dhcp_universe, 125, 1 },
  #if 0
 -- 
-2.14.5
+2.35.1
 

0010-Handle-null-timeout.patch

@@ -1,8 +1,7 @@
-From e269e137c3b7d25a2d089be508e6769731618d54 Mon Sep 17 00:00:00 2001
+From 7653f3ea80230d4b38bff1c65164aa18c6e51519 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:29:08 +0100
-Subject: [PATCH 10/21] Handle null timeout
-Cc: pzhukov@redhat.com
+Subject: [PATCH 10/28] Handle null timeout
 
 Handle cases in add_timeout() where the function is called with a NULL
 value for the 'when' parameter
@@ -13,7 +12,7 @@ ISC-Bugs: #19867 (rejected)
  1 file changed, 4 insertions(+)
 
 diff --git a/common/dispatch.c b/common/dispatch.c
-index 0207ad3..d7fe200 100644
+index 7def34c..9741ff5 100644
 --- a/common/dispatch.c
 +++ b/common/dispatch.c
 @@ -209,6 +209,10 @@ void add_timeout (when, where, what, ref, unref)
@@ -28,5 +27,5 @@ index 0207ad3..d7fe200 100644
  	t = (struct timeout *)0;
  	for (q = timeouts; q; q = q->next) {
 -- 
-2.14.5
+2.35.1
 

0011-Drop-unnecessary-capabilities.patch

@@ -1,8 +1,7 @@
-From 291f738f341a78f8c7974a7603d1a2eaa01ebacc Mon Sep 17 00:00:00 2001
+From 7ea2433d716172f160c9380ed0bb852fafe845a2 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:30:28 +0100
-Subject: [PATCH 11/21] Drop unnecessary capabilities
-Cc: pzhukov@redhat.com
+Subject: [PATCH 11/28] Drop unnecessary capabilities
 
 dhclient (#517649, #546765), dhcpd/dhcrelay (#699713)
 ---
@@ -29,10 +28,10 @@ index d177159..0689185 100644
  man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
  EXTRA_DIST = $(man_MANS)
 diff --git a/client/dhclient-script.8 b/client/dhclient-script.8
-index 0db5516..2eddb8f 100644
+index 37ecdc5..1a88e0e 100644
 --- a/client/dhclient-script.8
 +++ b/client/dhclient-script.8
-@@ -243,6 +243,16 @@ repeatedly initialized to the values provided by one server, and then
+@@ -249,6 +249,16 @@ repeatedly initialized to the values provided by one server, and then
  the other.   Assuming the information provided by both servers is
  valid, this shouldn't cause any real problems, but it could be
  confusing.
@@ -50,10 +49,10 @@ index 0db5516..2eddb8f 100644
  dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and
  dhclient.leases(5).
 diff --git a/client/dhclient.8 b/client/dhclient.8
-index 6d7fbdb..0145b9f 100644
+index 5029dac..bacf3bc 100644
 --- a/client/dhclient.8
 +++ b/client/dhclient.8
-@@ -134,6 +134,9 @@ dhclient - Dynamic Host Configuration Protocol Client
+@@ -135,6 +135,9 @@ dhclient - Dynamic Host Configuration Protocol Client
  .B -w
  ]
  [
@@ -63,7 +62,7 @@ index 6d7fbdb..0145b9f 100644
  .B -B
  ]
  [
-@@ -328,6 +331,32 @@ not to exit when it doesn't find any such interfaces.  The
+@@ -329,6 +332,32 @@ not to exit when it doesn't find any such interfaces.  The
  program can then be used to notify the client when a network interface
  has been added or removed, so that the client can attempt to configure an IP
  address on that interface.
@@ -97,7 +96,7 @@ index 6d7fbdb..0145b9f 100644
  .BI \-n
  Do not configure any interfaces.  This is most likely to be useful in
 diff --git a/client/dhclient.c b/client/dhclient.c
-index a86ab9e..5d3f5bc 100644
+index aefc119..b49fcb3 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
 @@ -41,6 +41,10 @@
@@ -111,7 +110,7 @@ index a86ab9e..5d3f5bc 100644
  /*
   * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
   * that when building ISC code.
-@@ -266,6 +270,9 @@ main(int argc, char **argv) {
+@@ -272,6 +276,9 @@ main(int argc, char **argv) {
  	int timeout_arg = 0;
  	char *arg_conf = NULL;
  	int arg_conf_len = 0;
@@ -121,7 +120,7 @@ index a86ab9e..5d3f5bc 100644
  
  	/* Initialize client globals. */
  	memset(&default_duid, 0, sizeof(default_duid));
-@@ -665,6 +672,10 @@ main(int argc, char **argv) {
+@@ -671,6 +678,10 @@ main(int argc, char **argv) {
  
  			dhclient_request_options = argv[i];
  
@@ -132,7 +131,7 @@ index a86ab9e..5d3f5bc 100644
  		} else if (argv[i][0] == '-') {
  			usage("Unknown command: %s", argv[i]);
  		} else if (interfaces_requested < 0) {
-@@ -725,6 +736,19 @@ main(int argc, char **argv) {
+@@ -731,6 +742,19 @@ main(int argc, char **argv) {
  		path_dhclient_script = s;
  	}
  
@@ -153,10 +152,10 @@ index a86ab9e..5d3f5bc 100644
  	initialize_common_option_spaces();
  
 diff --git a/configure.ac b/configure.ac
-index a797438..15fc0d7 100644
+index b2c306b..300117f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -612,6 +612,41 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn));
+@@ -603,6 +603,41 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn));
  # Look for optional headers.
  AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
  
@@ -199,10 +198,10 @@ index a797438..15fc0d7 100644
  AC_SEARCH_LIBS(socket, [socket])
  AC_SEARCH_LIBS(inet_ntoa, [nsl])
 diff --git a/relay/Makefile.am b/relay/Makefile.am
-index 2ba5979..8900e0b 100644
+index 5562b69..4c5cfa6 100644
 --- a/relay/Makefile.am
 +++ b/relay/Makefile.am
-@@ -6,7 +6,8 @@ dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
+@@ -8,6 +8,7 @@ dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
  		 @BINDLIBIRSDIR@/libirs.@A@ \
  		 @BINDLIBDNSDIR@/libdns.@A@ \
  		 @BINDLIBISCCFGDIR@/libisccfg.@A@ \
@@ -211,9 +210,8 @@ index 2ba5979..8900e0b 100644
 +		 $(CAPNG_LDADD)
  man_MANS = dhcrelay.8
  EXTRA_DIST = $(man_MANS)
- 
 diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index ea1be18..7b4f4f1 100644
+index a7b1286..0dc17d6 100644
 --- a/relay/dhcrelay.c
 +++ b/relay/dhcrelay.c
 @@ -32,6 +32,11 @@
@@ -228,7 +226,7 @@ index ea1be18..7b4f4f1 100644
  TIME default_lease_time = 43200; /* 12 hours... */
  TIME max_lease_time = 86400; /* 24 hours... */
  struct tree_cache *global_options[256];
-@@ -590,6 +595,10 @@ main(int argc, char **argv) {
+@@ -614,6 +619,10 @@ main(int argc, char **argv) {
  			if (++i == argc)
  				usage(use_noarg, argv[i-1]);
  			dhcrelay_sub_id = argv[i];
@@ -239,7 +237,7 @@ index ea1be18..7b4f4f1 100644
  #endif
  		} else if (!strcmp(argv[i], "-pf")) {
  			if (++i == argc)
-@@ -660,6 +669,17 @@ main(int argc, char **argv) {
+@@ -684,6 +693,17 @@ main(int argc, char **argv) {
  #endif
  	}
  
@@ -257,7 +255,7 @@ index ea1be18..7b4f4f1 100644
  	if (!quiet) {
  		log_info("%s %s", message, PACKAGE_VERSION);
  		log_info(copyright);
-@@ -816,6 +836,15 @@ main(int argc, char **argv) {
+@@ -840,6 +860,15 @@ main(int argc, char **argv) {
  	signal(SIGTERM, dhcp_signal_handler);  /* kill */
  #endif
  
@@ -274,5 +272,5 @@ index ea1be18..7b4f4f1 100644
  	dispatch();
  
 -- 
-2.14.5
+2.35.1
 

0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch

@@ -1,25 +1,24 @@
-From 2756fcc3f88c27d0e12e72dbdd2906fbf45f2362 Mon Sep 17 00:00:00 2001
+From 7e6299e72feaaf7e8bd499614999ba8a07dd1a8a Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:32:35 +0100
-Subject: [PATCH 12/21] RFC 3442 - Classless Static Route Option for DHCPv4
+Subject: [PATCH 12/28] RFC 3442 - Classless Static Route Option for DHCPv4
  (#516325)
-Cc: pzhukov@redhat.com
 
 (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #24572])
 ---
- client/clparse.c      | 13 ++++++++++--
- common/dhcp-options.5 | 43 +++++++++++++++++++++++++++++++++++++++
- common/inet.c         | 54 +++++++++++++++++++++++++++++++++++++++++++++++++
- common/options.c      | 49 +++++++++++++++++++++++++++++++++++++++++++-
- common/parse.c        | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ client/clparse.c      | 13 ++++++++--
+ common/dhcp-options.5 | 43 +++++++++++++++++++++++++++++++++
+ common/inet.c         | 54 +++++++++++++++++++++++++++++++++++++++++
+ common/options.c      | 49 ++++++++++++++++++++++++++++++++++++-
+ common/parse.c        | 56 ++++++++++++++++++++++++++++++++++++++++++-
  common/tables.c       |  2 ++
  includes/dhcp.h       |  1 +
  includes/dhcpd.h      |  2 ++
- includes/dhctoken.h   |  5 +++--
- 9 files changed, 219 insertions(+), 6 deletions(-)
+ includes/dhctoken.h   |  3 ++-
+ 9 files changed, 218 insertions(+), 5 deletions(-)
 
 diff --git a/client/clparse.c b/client/clparse.c
-index 44387ed..862e4f9 100644
+index 902b523..57f6456 100644
 --- a/client/clparse.c
 +++ b/client/clparse.c
 @@ -31,7 +31,7 @@
@@ -31,7 +30,7 @@ index 44387ed..862e4f9 100644
  /* There can be 2 extra requested options for DHCPv4-over-DHCPv6. */
  struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 2 + 1];
  
-@@ -87,7 +87,11 @@ isc_result_t read_client_conf ()
+@@ -90,7 +90,11 @@ isc_result_t read_client_conf ()
  				dhcp_universe.code_hash, &code, 0, MDL);
  
  	/* 4 */
@@ -44,7 +43,7 @@ index 44387ed..862e4f9 100644
  	option_code_hash_lookup(&default_requested_options[3],
  				dhcp_universe.code_hash, &code, 0, MDL);
  
-@@ -141,6 +145,11 @@ isc_result_t read_client_conf ()
+@@ -144,6 +148,11 @@ isc_result_t read_client_conf ()
  	option_code_hash_lookup(&default_requested_options[13],
  				dhcp_universe.code_hash, &code, 0, MDL);
  
@@ -57,10 +56,10 @@ index 44387ed..862e4f9 100644
  		if (default_requested_options[code] == NULL)
  			log_fatal("Unable to find option definition for "
 diff --git a/common/dhcp-options.5 b/common/dhcp-options.5
-index d9e1197..2343b19 100644
+index a784b32..86f04ed 100644
 --- a/common/dhcp-options.5
 +++ b/common/dhcp-options.5
-@@ -110,6 +110,26 @@ hexadecimal, separated by colons.  For example:
+@@ -117,6 +117,26 @@ hexadecimal, separated by colons.  For example:
  or
    option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f;
  .fi
@@ -87,7 +86,7 @@ index d9e1197..2343b19 100644
  .SH SETTING OPTION VALUES USING EXPRESSIONS
  Sometimes it's helpful to be able to set the value of a DHCP option
  based on some value that the client has sent.  To do this, you can
-@@ -1086,6 +1106,29 @@ dhclient-script will create routes:
+@@ -1093,6 +1113,29 @@ dhclient-script will create routes:
  .RE
  .PP
  .nf
@@ -118,7 +117,7 @@ index d9e1197..2343b19 100644
                                             [\fB,\fR \fIip-address\fR...]\fB;\fR
  .fi
 diff --git a/common/inet.c b/common/inet.c
-index c4da73c..981fb92 100644
+index 0f7f168..7c446d4 100644
 --- a/common/inet.c
 +++ b/common/inet.c
 @@ -519,6 +519,60 @@ free_iaddrcidrnetlist(struct iaddrcidrnetlist **result) {
@@ -183,10 +182,10 @@ index c4da73c..981fb92 100644
  /* XXX: should use a const pointer rather than passing the structure */
  const char *
 diff --git a/common/options.c b/common/options.c
-index fc0e088..3034cf0 100644
+index 92c8fee..66433c4 100644
 --- a/common/options.c
 +++ b/common/options.c
-@@ -729,7 +729,11 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
+@@ -734,7 +734,11 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
  		 * packet.
  		 */
  		priority_list[priority_len++] = DHO_SUBNET_MASK;
@@ -199,7 +198,7 @@ index fc0e088..3034cf0 100644
  		priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS;
  		priority_list[priority_len++] = DHO_HOST_NAME;
  		priority_list[priority_len++] = DHO_FQDN;
-@@ -1804,6 +1808,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+@@ -1812,6 +1816,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
  	unsigned long tval;
  	isc_boolean_t a_array = ISC_FALSE;
  	int len_used;
@@ -207,7 +206,7 @@ index fc0e088..3034cf0 100644
  
  	if (emit_commas)
  		comma = ',';
-@@ -1812,6 +1817,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+@@ -1820,6 +1825,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
  
  	memset (enumbuf, 0, sizeof enumbuf);
  
@@ -215,7 +214,7 @@ index fc0e088..3034cf0 100644
  	/* Figure out the size of the data. */
  	for (l = i = 0; option -> format [i]; i++, l++) {
  		if (l >= sizeof(fmtbuf) - 1)
-@@ -2004,6 +2010,33 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+@@ -2029,6 +2035,33 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
  	if (numhunk < 0)
  		numhunk = 1;
  
@@ -249,7 +248,7 @@ index fc0e088..3034cf0 100644
  	/* Cycle through the array (or hunk) printing the data. */
  	for (i = 0; i < numhunk; i++) {
  		if ((a_array == ISC_TRUE) && (i != 0) && (numelem > 0)) {
-@@ -2159,6 +2192,20 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+@@ -2197,6 +2230,20 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
  				strcpy(op, piaddr(iaddr));
  				dp += 4;
  				break;
@@ -271,12 +270,12 @@ index fc0e088..3034cf0 100644
  				iaddr.len = 16;
  				memcpy(iaddr.iabuf, dp, 16);
 diff --git a/common/parse.c b/common/parse.c
-index 3ac4ebf..f17bc0b 100644
+index b123a6c..7cf4f2a 100644
 --- a/common/parse.c
 +++ b/common/parse.c
 @@ -344,6 +344,39 @@ int parse_ip_addr (cfile, addr)
  	return 0;
- }	
+ }
  
 +/*
 + * destination-descriptor :== NUMBER DOT NUMBER |
@@ -336,7 +335,7 @@ index 3ac4ebf..f17bc0b 100644
  	      case IP6_ADDRESS:
  		type = '6';
  		break;
-@@ -5101,6 +5139,15 @@ int parse_option_token (rv, cfile, fmt, expr, uniform, lookups)
+@@ -5124,6 +5162,15 @@ int parse_option_token (rv, cfile, fmt, expr, uniform, lookups)
  		}
  		break;
  
@@ -352,7 +351,7 @@ index 3ac4ebf..f17bc0b 100644
  	      case '6': /* IPv6 address. */
  		if (!parse_ip6_addr(cfile, &addr)) {
  			return 0;
-@@ -5378,6 +5425,13 @@ int parse_option_decl (oc, cfile)
+@@ -5401,6 +5448,13 @@ int parse_option_decl (oc, cfile)
  					goto exit;
  				len = ip_addr.len;
  				dp = ip_addr.iabuf;
@@ -367,7 +366,7 @@ index 3ac4ebf..f17bc0b 100644
  			      alloc:
  				if (hunkix + len > sizeof hunkbuf) {
 diff --git a/common/tables.c b/common/tables.c
-index d2294c0..f1be07d 100644
+index ce12fcd..96521a6 100644
 --- a/common/tables.c
 +++ b/common/tables.c
 @@ -45,6 +45,7 @@ HASH_FUNCTIONS (option_code, const unsigned *, struct option,
@@ -378,7 +377,7 @@ index d2294c0..f1be07d 100644
     6 - IPv6 address
     l - 32-bit signed integer
     L - 32-bit unsigned integer
-@@ -216,6 +217,7 @@ static struct option dhcp_options[] = {
+@@ -223,6 +224,7 @@ static struct option dhcp_options[] = {
  #endif
  	{ "subnet-selection", "I",		&dhcp_universe, 118, 1 },
  	{ "domain-search", "D",			&dhcp_universe, 119, 1 },
@@ -387,11 +386,11 @@ index d2294c0..f1be07d 100644
  	{ "vivso", "Evendor.",			&dhcp_universe, 125, 1 },
  #if 0
 diff --git a/includes/dhcp.h b/includes/dhcp.h
-index 0a74137..95bf539 100644
+index cafe172..5a73129 100644
 --- a/includes/dhcp.h
 +++ b/includes/dhcp.h
-@@ -158,6 +158,7 @@ struct dhcp_packet {
- #define DHO_ASSOCIATED_IP			92
+@@ -159,6 +159,7 @@ struct dhcp_packet {
+ #define DHO_V6_ONLY_PREFERRED			108 /* RFC8925 */
  #define DHO_SUBNET_SELECTION			118 /* RFC3011! */
  #define DHO_DOMAIN_SEARCH			119 /* RFC3397 */
 +#define DHO_CLASSLESS_STATIC_ROUTES		121 /* RFC3442 */
@@ -399,10 +398,10 @@ index 0a74137..95bf539 100644
  #define DHO_VIVSO_SUBOPTIONS			125
  
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 3632a6b..2ac39ae 100644
+index 4a57002..25e1c72 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
-@@ -2951,6 +2951,7 @@ isc_result_t range2cidr(struct iaddrcidrnetlist **result,
+@@ -2967,6 +2967,7 @@ isc_result_t range2cidr(struct iaddrcidrnetlist **result,
  			const struct iaddr *lo, const struct iaddr *hi);
  isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
  const char *piaddr (struct iaddr);
@@ -410,7 +409,7 @@ index 3632a6b..2ac39ae 100644
  char *piaddrmask(struct iaddr *, struct iaddr *);
  char *piaddrcidr(const struct iaddr *, unsigned int);
  u_int16_t validate_port(char *);
-@@ -3169,6 +3170,7 @@ void parse_client_lease_declaration (struct parse *,
+@@ -3189,6 +3190,7 @@ void parse_client_lease_declaration (struct parse *,
  int parse_option_decl (struct option_cache **, struct parse *);
  void parse_string_list (struct parse *, struct string_list **, int);
  int parse_ip_addr (struct parse *, struct iaddr *);
@@ -419,21 +418,19 @@ index 3632a6b..2ac39ae 100644
  void parse_reject_statement (struct parse *, struct client_config *);
  
 diff --git a/includes/dhctoken.h b/includes/dhctoken.h
-index 7e7215a..b4d93ba 100644
+index 6daa422..3f5334e 100644
 --- a/includes/dhctoken.h
 +++ b/includes/dhctoken.h
-@@ -376,8 +376,9 @@ enum dhcp_token {
- 	LEASE_ID_FORMAT = 676,
- 	TOKEN_HEX = 677,
+@@ -378,7 +378,8 @@ enum dhcp_token {
  	TOKEN_OCTAL = 678,
--	KEY_ALGORITHM = 679
--        BOOTP_BROADCAST_ALWAYS = 680
-+	KEY_ALGORITHM = 679,
-+        BOOTP_BROADCAST_ALWAYS = 680,
-+	DESTINATION_DESCRIPTOR = 681
+ 	KEY_ALGORITHM = 679,
+ 	BOOTP_BROADCAST_ALWAYS = 680,
+-	DISCONNECT = 681
++	DESTINATION_DESCRIPTOR = 681,
++	DISCONNECT = 682
  };
  
  #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\
 -- 
-2.14.5
+2.35.1
 

0013-DHCPv6-over-PPP-support-626514.patch

@@ -1,8 +1,7 @@
-From 43332b29f0c8fef3ddd225e31f5f2b4ff8273b36 Mon Sep 17 00:00:00 2001
+From fe89d58ea8627c66feffa81997daa024834eeb15 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:33:06 +0100
-Subject: [PATCH 13/21] DHCPv6 over PPP support (#626514)
-Cc: pzhukov@redhat.com
+Subject: [PATCH 13/28] DHCPv6 over PPP support (#626514)
 
 ---
  client/dhc6.c     |  3 ++-
@@ -15,10 +14,10 @@ Cc: pzhukov@redhat.com
  7 files changed, 54 insertions(+), 5 deletions(-)
 
 diff --git a/client/dhc6.c b/client/dhc6.c
-index 16a0838..3171828 100644
+index 35cf3d0..88fd07d 100644
 --- a/client/dhc6.c
 +++ b/client/dhc6.c
-@@ -5744,7 +5744,8 @@ make_client6_options(struct client_state *client, struct option_state **op,
+@@ -5737,7 +5737,8 @@ make_client6_options(struct client_state *client, struct option_state **op,
  	 */
  	if ((oc = lookup_option(&dhcpv6_universe, *op,
  				D6O_CLIENTID)) == NULL) {
@@ -29,10 +28,10 @@ index 16a0838..3171828 100644
  			log_fatal("Failure assembling a DUID.");
  
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 5d3f5bc..301132c 100644
+index b49fcb3..a99e21f 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -1202,8 +1202,8 @@ main(int argc, char **argv) {
+@@ -1223,8 +1223,8 @@ main(int argc, char **argv) {
  			if (default_duid.buffer != NULL)
  				data_string_forget(&default_duid, MDL);
  
@@ -43,7 +42,7 @@ index 5d3f5bc..301132c 100644
  		}
  	}
  
-@@ -3956,7 +3956,7 @@ write_options(struct client_state *client, struct option_state *options,
+@@ -4202,7 +4202,7 @@ write_options(struct client_state *client, struct option_state *options,
   * is not how it is intended.  Upcoming rearchitecting the client should
   * address this "one daemon model."
   */
@@ -52,7 +51,7 @@ index 5d3f5bc..301132c 100644
  form_duid(struct data_string *duid, const char *file, int line)
  {
  	struct interface_info *ip;
-@@ -3969,6 +3969,15 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -4215,6 +4215,15 @@ form_duid(struct data_string *duid, const char *file, int line)
  	if (ip == NULL)
  		log_fatal("Impossible condition at %s:%d.", MDL);
  
@@ -68,7 +67,7 @@ index 5d3f5bc..301132c 100644
  	if ((ip->hw_address.hlen == 0) ||
  	    (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
  		log_fatal("Impossible hardware address length at %s:%d.", MDL);
-@@ -4014,6 +4023,8 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -4260,6 +4269,8 @@ form_duid(struct data_string *duid, const char *file, int line)
  		log_info("Created duid %s.", str);
  		dfree(str, MDL);
  	}
@@ -78,7 +77,7 @@ index 5d3f5bc..301132c 100644
  
  /* Write the default DUID to the lease store. */
 diff --git a/common/bpf.c b/common/bpf.c
-index 67b6d64..ffbd09a 100644
+index d2a0549..aede242 100644
 --- a/common/bpf.c
 +++ b/common/bpf.c
 @@ -650,6 +650,22 @@ get_hw_addr(const char *name, struct hardware *hw) {
@@ -105,7 +104,7 @@ index 67b6d64..ffbd09a 100644
                          log_fatal("Unsupported device type %d for \"%s\"",
                                    sa->sdl_type, name);
 diff --git a/common/lpf.c b/common/lpf.c
-index 82a279b..b0ed01c 100644
+index bd20b3f..bb8822a 100644
 --- a/common/lpf.c
 +++ b/common/lpf.c
 @@ -563,6 +563,22 @@ get_hw_addr(const char *name, struct hardware *hw) {
@@ -132,7 +131,7 @@ index 82a279b..b0ed01c 100644
  			log_fatal("Unsupported device type %ld for \"%s\"",
  				  (long int)sa->sa_family, name);
 diff --git a/includes/dhcp.h b/includes/dhcp.h
-index 95bf539..4cc547a 100644
+index 5a73129..7202f1d 100644
 --- a/includes/dhcp.h
 +++ b/includes/dhcp.h
 @@ -80,6 +80,8 @@ struct dhcp_packet {
@@ -145,10 +144,10 @@ index 95bf539..4cc547a 100644
     extensions field). */
  #define DHCP_OPTIONS_COOKIE	"\143\202\123\143"
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 2ac39ae..faa9251 100644
+index 25e1c72..4c5e877 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
-@@ -3051,7 +3051,7 @@ void client_dns_remove(struct client_state *client, struct iaddr *addr);
+@@ -3071,7 +3071,7 @@ void client_dns_remove(struct client_state *client, struct iaddr *addr);
  
  void dhcpv4_client_assignments(void);
  void dhcpv6_client_assignments(void);
@@ -158,7 +157,7 @@ index 2ac39ae..faa9251 100644
  void dhcp4o6_start(void);
  
 diff --git a/server/dhcpv6.c b/server/dhcpv6.c
-index a7110f9..c5ce7e8 100644
+index 0ea0532..7d61dc5 100644
 --- a/server/dhcpv6.c
 +++ b/server/dhcpv6.c
 @@ -482,6 +482,9 @@ generate_new_server_duid(void) {
@@ -172,5 +171,5 @@ index a7110f9..c5ce7e8 100644
  	if (p == NULL) {
  		return ISC_R_UNEXPECTED;
 -- 
-2.14.5
+2.35.1
 

0014-IPoIB-support-660681.patch

@@ -1,24 +1,23 @@
-From de8468cf16c0fa9d01412446fcf1d44ccd0fd411 Mon Sep 17 00:00:00 2001
+From 90d64318e17df066c27b8e99ba6ab7f51154917b Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:34:21 +0100
-Subject: [PATCH 14/21] IPoIB support (#660681)
-Cc: pzhukov@redhat.com
+Subject: [PATCH 14/28] IPoIB support (#660681)
 
 (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #24249])
 ---
- client/dhclient.c |  32 +++++++
- common/bpf.c      |  32 +++++++
+ client/dhclient.c |  33 ++++++
+ common/bpf.c      |  32 ++++++
  common/discover.c |   4 +-
- common/lpf.c      | 262 +++++++++++++++++++++++++++++++++++++++++++++++++-----
+ common/lpf.c      | 274 ++++++++++++++++++++++++++++++++++++++++++----
  common/socket.c   |   8 +-
  includes/dhcpd.h  |   6 +-
- 6 files changed, 315 insertions(+), 29 deletions(-)
+ 6 files changed, 329 insertions(+), 28 deletions(-)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 301132c..dc9080e 100644
+index a99e21f..48edddf 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -205,6 +205,8 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s";
+@@ -211,6 +211,8 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s";
    
  #define DHCLIENT_USAGEH "{--version|--help|-h}"
  
@@ -27,9 +26,9 @@ index 301132c..dc9080e 100644
  static void
  usage(const char *sfmt, const char *sarg)
  {
-@@ -1191,6 +1193,13 @@ main(int argc, char **argv) {
+@@ -1213,6 +1215,14 @@ main(int argc, char **argv) {
  	}
- 	srandom(seed + cur_time + (unsigned)getpid());
+ 	srandom(seed);
  
 +	/* Setup specific Infiniband options */
 +	for (ip = interfaces; ip; ip = ip->next) {
@@ -38,10 +37,11 @@ index 301132c..dc9080e 100644
 +			setup_ib_interface(ip);
 +		}
 +	}
- 
++
  	/*
  	 * Establish a default DUID.  We always do so for v6 and
-@@ -1486,6 +1495,29 @@ int find_subnet (struct subnet **sp,
+ 	 * do so if desired for v4 via the -D or -i options
+@@ -1507,6 +1517,29 @@ int find_subnet (struct subnet **sp,
  	return 0;
  }
  
@@ -72,7 +72,7 @@ index 301132c..dc9080e 100644
   *
   * Each routine is called from the dhclient_state_machine() in one of
 diff --git a/common/bpf.c b/common/bpf.c
-index ffbd09a..568e3d9 100644
+index aede242..812cac3 100644
 --- a/common/bpf.c
 +++ b/common/bpf.c
 @@ -237,11 +237,43 @@ int dhcp_bpf_relay_filter_len =
@@ -120,10 +120,10 @@ index ffbd09a..568e3d9 100644
  struct bpf_insn dhcp_bpf_tr_filter [] = {
          /* accept all token ring packets due to variable length header */
 diff --git a/common/discover.c b/common/discover.c
-index 6ef8852..65881fc 100644
+index ed338b4..e562225 100644
 --- a/common/discover.c
 +++ b/common/discover.c
-@@ -894,7 +894,7 @@ discover_interfaces(int state) {
+@@ -899,7 +899,7 @@ discover_interfaces(int state) {
  				if_register_send(tmp);
  			} else {
  				/* get_hw_addr() was called by register. */
@@ -132,7 +132,7 @@ index 6ef8852..65881fc 100644
  			}
  			break;
  #ifdef DHCPv6
-@@ -907,7 +907,7 @@ discover_interfaces(int state) {
+@@ -912,7 +912,7 @@ discover_interfaces(int state) {
  				   so now we have to call it explicitly
  				   to not leave the hardware address unknown
  				   (some code expects it cannot be. */
@@ -142,7 +142,7 @@ index 6ef8852..65881fc 100644
  				if_register_linklocal6(tmp);
  			}
 diff --git a/common/lpf.c b/common/lpf.c
-index b0ed01c..b732a86 100644
+index bb8822a..fcaa13d 100644
 --- a/common/lpf.c
 +++ b/common/lpf.c
 @@ -45,6 +45,17 @@
@@ -230,7 +230,35 @@ index b0ed01c..b732a86 100644
  		}
  	}
  	}
-@@ -330,6 +353,54 @@ static void lpf_tr_filter_setup (info)
+@@ -253,6 +276,18 @@ static void lpf_gen_filter_setup (info)
+ 
+ 	memset(&p, 0, sizeof(p));
+ 
++	if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++		p.len = dhcp_ib_bpf_filter_len;
++		p.filter = dhcp_ib_bpf_filter;
++
++		/* Patch the server port into the LPF program...
++		   XXX
++		   changes to filter program may require changes
++		   to the insn number(s) used below!
++		   XXX */
++		dhcp_ib_bpf_filter[6].k = ntohs (local_port);
++	} else {
++
+ 	/* Set up the bpf filter program structure.    This is defined in
+ 	   bpf.c */
+ 	p.len = dhcp_bpf_filter_len;
+@@ -275,6 +310,8 @@ static void lpf_gen_filter_setup (info)
+ #endif
+ 	dhcp_bpf_filter [8].k = ntohs (local_port);
+ 
++	}
++
+ 	if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p,
+ 			sizeof p) < 0) {
+ 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+@@ -330,6 +367,54 @@ static void lpf_tr_filter_setup (info)
  #endif /* USE_LPF_RECEIVE */
  
  #ifdef USE_LPF_SEND
@@ -285,7 +313,7 @@ index b0ed01c..b732a86 100644
  ssize_t send_packet (interface, packet, raw, len, from, to, hto)
  	struct interface_info *interface;
  	struct packet *packet;
-@@ -350,6 +421,11 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
+@@ -350,6 +435,11 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
  		return send_fallback (interface, packet, raw,
  				      len, from, to, hto);
  
@@ -297,7 +325,7 @@ index b0ed01c..b732a86 100644
  	if (hto == NULL && interface->anycast_mac_addr.hlen)
  		hto = &interface->anycast_mac_addr;
  
-@@ -370,6 +446,42 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
+@@ -370,6 +460,42 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
  #endif /* USE_LPF_SEND */
  
  #ifdef USE_LPF_RECEIVE
@@ -340,7 +368,7 @@ index b0ed01c..b732a86 100644
  ssize_t receive_packet (interface, buf, len, from, hfrom)
  	struct interface_info *interface;
  	unsigned char *buf;
-@@ -408,6 +520,10 @@ ssize_t receive_packet (interface, buf, len, from, hfrom)
+@@ -408,6 +534,10 @@ ssize_t receive_packet (interface, buf, len, from, hfrom)
  	};
  #endif /* PACKET_AUXDATA */
  
@@ -351,7 +379,7 @@ index b0ed01c..b732a86 100644
  	length = recvmsg (interface->rfdesc, &msg, 0);
  	if (length <= 0)
  		return length;
-@@ -521,11 +637,33 @@ void maybe_setup_fallback ()
+@@ -521,11 +651,33 @@ void maybe_setup_fallback ()
  #endif
  
  #if defined (USE_LPF_RECEIVE) || defined (USE_LPF_HWADDR)
@@ -388,12 +416,8 @@ index b0ed01c..b732a86 100644
  
  	if (strlen(name) >= sizeof(tmp.ifr_name)) {
  		log_fatal("Device name too long: \"%s\"", name);
-@@ -539,16 +677,61 @@ get_hw_addr(const char *name, struct hardware *hw) {
- 	memset(&tmp, 0, sizeof(tmp));
- 	strcpy(tmp.ifr_name, name);
- 	if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) {
--		log_fatal("Error getting hardware address for \"%s\": %m", 
-+		log_fatal("Error getting hardware address for \"%s\": %m",
+@@ -542,13 +694,58 @@ get_hw_addr(const char *name, struct hardware *hw) {
+ 		log_fatal("Error getting hardware address for \"%s\": %m",
  			  name);
  	}
 +	close(sock);
@@ -453,7 +477,7 @@ index b0ed01c..b732a86 100644
  			break;
  		case ARPHRD_IEEE802:
  #ifdef ARPHRD_IEEE802_TR
-@@ -556,18 +739,50 @@ get_hw_addr(const char *name, struct hardware *hw) {
+@@ -556,18 +753,50 @@ get_hw_addr(const char *name, struct hardware *hw) {
  #endif /* ARPHRD_IEEE802_TR */
  			hw->hlen = 7;
  			hw->hbuf[0] = HTYPE_IEEE802;
@@ -508,7 +532,7 @@ index b0ed01c..b732a86 100644
  			hw->hlen = 0;
  			hw->hbuf[0] = HTYPE_RESERVED;
  			/* 0xdeadbeef should never occur on the wire,
-@@ -580,10 +795,13 @@ get_hw_addr(const char *name, struct hardware *hw) {
+@@ -580,10 +809,13 @@ get_hw_addr(const char *name, struct hardware *hw) {
  			break;
  #endif
  		default:
@@ -526,10 +550,10 @@ index b0ed01c..b732a86 100644
  }
  #endif
 diff --git a/common/socket.c b/common/socket.c
-index 483eb9c..6e1caac 100644
+index 3953eac..903d034 100644
 --- a/common/socket.c
 +++ b/common/socket.c
-@@ -350,7 +350,7 @@ void if_register_send (info)
+@@ -358,7 +358,7 @@ void if_register_send (info)
  	info->wfdesc = if_register_socket(info, AF_INET, 0, NULL);
  	/* If this is a normal IPv4 address, get the hardware address. */
  	if (strcmp(info->name, "fallback") != 0)
@@ -538,7 +562,7 @@ index 483eb9c..6e1caac 100644
  #if defined (USE_SOCKET_FALLBACK)
  	/* Fallback only registers for send, but may need to receive as
  	   well. */
-@@ -413,7 +413,7 @@ void if_register_receive (info)
+@@ -421,7 +421,7 @@ void if_register_receive (info)
  #endif /* IP_PKTINFO... */
  	/* If this is a normal IPv4 address, get the hardware address. */
  	if (strcmp(info->name, "fallback") != 0)
@@ -547,7 +571,7 @@ index 483eb9c..6e1caac 100644
  
  	if (!quiet_interface_discovery)
  		log_info ("Listening on Socket/%s%s%s",
-@@ -567,7 +567,7 @@ if_register6(struct interface_info *info, int do_multicast) {
+@@ -577,7 +577,7 @@ if_register6(struct interface_info *info, int do_multicast) {
  	if (req_multi)
  		if_register_multicast(info);
  
@@ -556,7 +580,7 @@ index 483eb9c..6e1caac 100644
  
  	if (!quiet_interface_discovery) {
  		if (info->shared_network != NULL) {
-@@ -623,7 +623,7 @@ if_register_linklocal6(struct interface_info *info) {
+@@ -633,7 +633,7 @@ if_register_linklocal6(struct interface_info *info) {
  	info->rfdesc = sock;
  	info->wfdesc = sock;
  
@@ -566,7 +590,7 @@ index 483eb9c..6e1caac 100644
  	if (!quiet_interface_discovery) {
  		if (info->shared_network != NULL) {
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index faa9251..0c1a0aa 100644
+index 4c5e877..e9e52e7 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
 @@ -485,6 +485,9 @@ struct packet {
@@ -579,7 +603,7 @@ index faa9251..0c1a0aa 100644
  struct hardware {
  	u_int8_t hlen;
  	u_int8_t hbuf[HARDWARE_ADDR_LEN + 1];
-@@ -1365,6 +1368,7 @@ struct interface_info {
+@@ -1380,6 +1383,7 @@ struct interface_info {
  	struct shared_network *shared_network;
  				/* Networks connected to this interface. */
  	struct hardware hw_address;	/* Its physical address. */
@@ -587,7 +611,7 @@ index faa9251..0c1a0aa 100644
  	struct in_addr *addresses;	/* Addresses associated with this
  					 * interface.
  					 */
-@@ -2633,7 +2637,7 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t);
+@@ -2649,7 +2653,7 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t);
  #endif
  const char *print_time(TIME);
  
@@ -597,5 +621,5 @@ index faa9251..0c1a0aa 100644
                     const char *file, int line);
  char *format_lease_id(const unsigned char *s, unsigned len, int format,
 -- 
-2.14.5
+2.35.1
 

0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch

@@ -1,19 +1,18 @@
-From 7ac7d0b00874ee996c7ee75a595c029759368aad Mon Sep 17 00:00:00 2001
+From 3baf35269555e2223dbd1733cb1c475cb7f2ed7a Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:35:47 +0100
-Subject: [PATCH 15/21] Add GUID/DUID to dhcpd logs (#1064416)
-Cc: pzhukov@redhat.com
+Subject: [PATCH 15/28] Add GUID/DUID to dhcpd logs (#1064416)
 
 ---
- client/dhclient.c | 75 ++++++++++++++++++++++++++++++++++++++++++----------
- server/dhcp.c     | 78 +++++++++++++++++++++++++++++++++----------------------
- 2 files changed, 108 insertions(+), 45 deletions(-)
+ client/dhclient.c | 70 ++++++++++++++++++++++++++++++++++--------
+ server/dhcp.c     | 78 ++++++++++++++++++++++++++++-------------------
+ 2 files changed, 105 insertions(+), 43 deletions(-)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index dc9080e..8e57da9 100644
+index 48edddf..181f6e1 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -1170,6 +1170,26 @@ main(int argc, char **argv) {
+@@ -1176,6 +1176,26 @@ main(int argc, char **argv) {
  		}
  	}
  
@@ -40,60 +39,56 @@ index dc9080e..8e57da9 100644
  	/* At this point, all the interfaces that the script thinks
  	   are relevant should be running, so now we once again call
  	   discover_interfaces(), and this time ask it to actually set
-@@ -1184,14 +1204,36 @@ main(int argc, char **argv) {
- 	   Not much entropy, but we're booting, so we're not likely to
- 	   find anything better. */
- 	seed = 0;
-+	int seed_flag = 0;
- 	for (ip = interfaces; ip; ip = ip->next) {
- 		int junk;
-+		if ( ip -> hw_address.hlen <= sizeof seed )
-+		  continue;
- 		memcpy(&junk,
- 		       &ip->hw_address.hbuf[ip->hw_address.hlen -
- 					    sizeof seed], sizeof seed);
- 		seed += junk;
-+		seed_flag = 1;
- 	}
--	srandom(seed + cur_time + (unsigned)getpid());
-+	if ( seed_flag == 0 ) {
-+		if ( backup_seed != 0 ) {
-+		  seed = backup_seed;
-+		  log_info ("xid: rand init seed (0x%x) built using all"
-+			    " available interfaces",seed);
-+		}
-+		else {
-+		  seed = cur_time^((unsigned) gethostid()) ;
-+		  log_info ("xid: warning: no netdev with useable HWADDR found"
-+			    " for seed's uniqueness enforcement");
-+		  log_info ("xid: rand init seed (0x%x) built using gethostid",
-+			    seed);
-+		}
-+		/* we only use seed and no current time as a broadcast reply */
-+		/* will certainly be used by the hwaddrless interface */
-+		srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid());
-+	}
-+	else
-+	        srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid());
+@@ -1204,14 +1224,34 @@ main(int argc, char **argv) {
+ 		   Not much entropy, but we're booting, so we're not likely to
+ 		   find anything better. */
  
- 	/* Setup specific Infiniband options */
- 	for (ip = interfaces; ip; ip = ip->next) {
-@@ -1746,10 +1788,10 @@ void dhcpack (packet)
- #endif
++		int seed_flag = 0;
+ 		for (ip = interfaces; ip; ip = ip->next) {
+ 			int junk;
++			if ( ip -> hw_address.hlen <= sizeof seed )
++			  continue;
+ 			memcpy(&junk,
+ 			       &ip->hw_address.hbuf[ip->hw_address.hlen -
+ 						    sizeof seed], sizeof seed);
+ 			seed += junk;
++			seed_flag = 1;
+ 		}
+-		seed += cur_time + (unsigned)getpid();
++		if ( seed_flag == 0 ) {
++			if ( backup_seed != 0 ) {
++			  seed = backup_seed;
++			  log_info ("xid: rand init seed (0x%x) built using all"
++				    " available interfaces",seed);
++			}
++			else {
++			  seed = cur_time^((unsigned) gethostid()) ;
++			  log_info ("xid: warning: no netdev with useable HWADDR found"
++				    " for seed's uniqueness enforcement");
++			  log_info ("xid: rand init seed (0x%x) built using gethostid",
++				    seed);
++			}
++			/* we only use seed and no current time as a broadcast reply */
++			/* will certainly be used by the hwaddrless interface */
++		}
++		seed += ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid();
+ 	}
+ 	srandom(seed);
+ 
+@@ -1869,9 +1909,10 @@ void dhcpack (packet)
  		return;
  	}
--
--	log_info ("DHCPACK of %s from %s",
--		  inet_ntoa(packet->raw->yiaddr),
--		  piaddr (packet->client_addr));
-+	log_info ("DHCPACK of %s from %s (xid=0x%x)",
-+                  inet_ntoa(packet->raw->yiaddr),
-+                  piaddr (packet -> client_addr),
-+                  ntohl(client -> xid));
  
- 	lease = packet_to_lease (packet, client);
- 	if (!lease) {
-@@ -2669,7 +2711,7 @@ void dhcpnak (packet)
+-	log_info ("DHCPACK of %s from %s",
++	log_info ("DHCPACK of %s from %s (xid=0x%x)",
+ 		  inet_ntoa(packet->raw->yiaddr),
+-		  piaddr (packet->client_addr));
++		  piaddr (packet -> client_addr),
++		  ntohl(client -> xid));
+ 
+ 	/* Check v6only first. */
+ 	v6only_wait = check_v6only(packet, client);
+@@ -2825,7 +2866,7 @@ void dhcpnak (packet)
  		return;
  	}
  
@@ -102,7 +97,7 @@ index dc9080e..8e57da9 100644
  
  	if (!client -> active) {
  #if defined (DEBUG)
-@@ -2802,10 +2844,10 @@ void send_discover (cpp)
+@@ -2958,10 +2999,10 @@ void send_discover (cpp)
  			  (long)(client -> interval));
  	} else
  #endif
@@ -115,7 +110,7 @@ index dc9080e..8e57da9 100644
  
  	/* Send out a packet. */
  #if defined(DHCPv6) && defined(DHCP4o6)
-@@ -3108,10 +3150,12 @@ void send_request (cpp)
+@@ -3355,10 +3396,12 @@ void send_request (cpp)
  	}
  
  	strncpy(rip_buf, rip_str, sizeof(rip_buf)-1);
@@ -130,7 +125,7 @@ index dc9080e..8e57da9 100644
  
  #if defined(DHCPv6) && defined(DHCP4o6)
  	if (dhcpv4_over_dhcpv6) {
-@@ -3168,11 +3212,13 @@ void send_decline (cpp)
+@@ -3415,11 +3458,13 @@ void send_decline (cpp)
  		log_info ("DHCPDECLINE");
  	} else
  #endif
@@ -146,7 +141,7 @@ index dc9080e..8e57da9 100644
  
  	/* Send out a packet. */
  #if defined(DHCPv6) && defined(DHCP4o6)
-@@ -3231,11 +3277,12 @@ void send_release (cpp)
+@@ -3478,11 +3523,12 @@ void send_release (cpp)
  		log_info ("DHCPRELEASE");
  	} else
  #endif
@@ -162,10 +157,10 @@ index dc9080e..8e57da9 100644
  #if defined(DHCPv6) && defined(DHCP4o6)
  	if (dhcpv4_over_dhcpv6) {
 diff --git a/server/dhcp.c b/server/dhcp.c
-index 20f2a62..0582c4c 100644
+index ae805a6..8363840 100644
 --- a/server/dhcp.c
 +++ b/server/dhcp.c
-@@ -87,6 +87,42 @@ const int dhcp_type_name_max = ((sizeof dhcp_type_names) / sizeof (char *));
+@@ -93,6 +93,42 @@ const int dhcp_type_name_max = ((sizeof dhcp_type_names) / sizeof (char *));
  
  static TIME leaseTimeCheck(TIME calculated, TIME alternate);
  
@@ -208,7 +203,7 @@ index 20f2a62..0582c4c 100644
  void
  dhcp (struct packet *packet) {
  	int ms_nulltp = 0;
-@@ -129,9 +165,7 @@ dhcp (struct packet *packet) {
+@@ -135,9 +171,7 @@ dhcp (struct packet *packet) {
  
  		log_info("%s from %s via %s: %s", s,
  			 (packet->raw->htype
@@ -219,7 +214,7 @@ index 20f2a62..0582c4c 100644
  			  : "<no identifier>"),
  			 packet->raw->giaddr.s_addr
  			 ? inet_ntoa(packet->raw->giaddr)
-@@ -328,9 +362,7 @@ void dhcpdiscover (packet, ms_nulltp)
+@@ -334,9 +368,7 @@ void dhcpdiscover (packet, ms_nulltp)
  #endif
  	snprintf (msgbuf, sizeof msgbuf, "DHCPDISCOVER from %s %s%s%svia %s",
  		 (packet -> raw -> htype
@@ -230,7 +225,7 @@ index 20f2a62..0582c4c 100644
  		  : (lease
  		     ? print_hex_1(lease->uid_len, lease->uid, 60)
  		     : "<no identifier>")),
-@@ -542,9 +574,7 @@ void dhcprequest (packet, ms_nulltp, ip_lease)
+@@ -548,9 +580,7 @@ void dhcprequest (packet, ms_nulltp, ip_lease)
  		 "DHCPREQUEST for %s%s from %s %s%s%svia %s",
  		 piaddr (cip), smbuf,
  		 (packet -> raw -> htype
@@ -241,7 +236,7 @@ index 20f2a62..0582c4c 100644
  		  : (lease
  		     ? print_hex_1(lease->uid_len, lease->uid, 60)
  		     : "<no identifier>")),
-@@ -785,9 +815,7 @@ void dhcprelease (packet, ms_nulltp)
+@@ -791,9 +821,7 @@ void dhcprelease (packet, ms_nulltp)
  	if ((oc = lookup_option (&dhcp_universe, packet -> options,
  				 DHO_DHCP_REQUESTED_ADDRESS))) {
  		log_info ("DHCPRELEASE from %s specified requested-address.",
@@ -252,7 +247,7 @@ index 20f2a62..0582c4c 100644
  	}
  
  	oc = lookup_option (&dhcp_universe, packet -> options,
-@@ -879,9 +907,7 @@ void dhcprelease (packet, ms_nulltp)
+@@ -885,9 +913,7 @@ void dhcprelease (packet, ms_nulltp)
  		 "DHCPRELEASE of %s from %s %s%s%svia %s (%sfound)",
  		 cstr,
  		 (packet -> raw -> htype
@@ -263,7 +258,7 @@ index 20f2a62..0582c4c 100644
  		  : (lease
  		     ? print_hex_1(lease->uid_len, lease->uid, 60)
  		     : "<no identifier>")),
-@@ -986,9 +1012,7 @@ void dhcpdecline (packet, ms_nulltp)
+@@ -992,9 +1018,7 @@ void dhcpdecline (packet, ms_nulltp)
  		 "DHCPDECLINE of %s from %s %s%s%svia %s",
  		 piaddr (cip),
  		 (packet -> raw -> htype
@@ -274,7 +269,7 @@ index 20f2a62..0582c4c 100644
  		  : (lease
  		     ? print_hex_1(lease->uid_len, lease->uid, 60)
  		     : "<no identifier>")),
-@@ -1732,8 +1756,7 @@ void dhcpinform (packet, ms_nulltp)
+@@ -1740,8 +1764,7 @@ void dhcpinform (packet, ms_nulltp)
  	/* Report what we're sending. */
  	snprintf(msgbuf, sizeof msgbuf, "DHCPACK to %s (%s) via", piaddr(cip),
  		 (packet->raw->htype && packet->raw->hlen) ?
@@ -284,7 +279,7 @@ index 20f2a62..0582c4c 100644
  			"<no client hardware address>");
  	log_info("%s %s", msgbuf, gip.len ? piaddr(gip) :
  					    packet->interface->name);
-@@ -1918,9 +1941,7 @@ void nak_lease (packet, cip, network_group)
+@@ -1926,9 +1949,7 @@ void nak_lease (packet, cip, network_group)
  #endif
  	log_info ("DHCPNAK on %s to %s via %s",
  	      piaddr (*cip),
@@ -295,7 +290,7 @@ index 20f2a62..0582c4c 100644
  	      packet -> raw -> giaddr.s_addr
  	      ? inet_ntoa (packet -> raw -> giaddr)
  	      : packet -> interface -> name);
-@@ -3936,7 +3957,7 @@ void dhcp_reply (lease)
+@@ -4044,7 +4065,7 @@ void dhcp_reply (lease)
  		   ? (state -> offer == DHCPACK ? "DHCPACK" : "DHCPOFFER")
  		   : "BOOTREPLY"),
  		  piaddr (lease -> ip_addr),
@@ -304,7 +299,7 @@ index 20f2a62..0582c4c 100644
  		   ? print_hw_addr (lease -> hardware_addr.hbuf [0],
  				    lease -> hardware_addr.hlen - 1,
  				    &lease -> hardware_addr.hbuf [1])
-@@ -4497,10 +4518,7 @@ int find_lease (struct lease **lp,
+@@ -4605,10 +4626,7 @@ int find_lease (struct lease **lp,
  			if (uid_lease) {
  			    if (uid_lease->binding_state == FTS_ACTIVE) {
  				log_error ("client %s has duplicate%s on %s",
@@ -316,7 +311,7 @@ index 20f2a62..0582c4c 100644
  					   " leases",
  					   (ip_lease -> subnet ->
  					    shared_network -> name));
-@@ -4667,9 +4685,7 @@ int find_lease (struct lease **lp,
+@@ -4775,9 +4793,7 @@ int find_lease (struct lease **lp,
  			log_error("uid lease %s for client %s is duplicate "
  				  "on %s",
  				  piaddr(uid_lease->ip_addr),
@@ -328,5 +323,5 @@ index 20f2a62..0582c4c 100644
  
  			if (!packet -> raw -> ciaddr.s_addr &&
 -- 
-2.14.5
+2.35.1
 

0016-Turn-on-creating-sending-of-DUID.patch

@@ -1,19 +1,18 @@
-From 1f0473939bcb17095bbef48cd9a81105a3de9846 Mon Sep 17 00:00:00 2001
+From 0a0a7e1afa171289b9e9d855c519101bbd71b5fe Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:36:30 +0100
-Subject: [PATCH 16/21] Turn on creating/sending of DUID
-Cc: pzhukov@redhat.com
+Subject: [PATCH 16/28] Turn on creating/sending of DUID
 
 as client identifier with DHCPv4 clients (#560361c#40, rfc4361)
 ---
- client/dhclient.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ client/dhclient.c | 74 ++++++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 70 insertions(+), 4 deletions(-)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 8e57da9..ccc98e4 100644
+index 181f6e1..444d251 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -4021,6 +4021,59 @@ write_options(struct client_state *client, struct option_state *options,
+@@ -4267,6 +4267,59 @@ write_options(struct client_state *client, struct option_state *options,
  	}
  }
  
@@ -73,7 +72,7 @@ index 8e57da9..ccc98e4 100644
  /*
   * The "best" default DUID, since we cannot predict any information
   * about the system (such as whether or not the hardware addresses are
-@@ -4041,6 +4094,7 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -4287,6 +4340,7 @@ form_duid(struct data_string *duid, const char *file, int line)
  	struct interface_info *ip;
  	int len;
  	char *str;
@@ -81,7 +80,7 @@ index 8e57da9..ccc98e4 100644
  
  	/* For now, just use the first interface on the list. */
  	ip = interfaces;
-@@ -4061,9 +4115,16 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -4307,9 +4361,16 @@ form_duid(struct data_string *duid, const char *file, int line)
  	    (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
  		log_fatal("Impossible hardware address length at %s:%d.", MDL);
  
@@ -101,7 +100,7 @@ index 8e57da9..ccc98e4 100644
  	/*
  	 * 2 bytes for the 'duid type' field.
  	 * 2 bytes for the 'htype' field.
-@@ -4074,13 +4135,18 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -4320,13 +4381,18 @@ form_duid(struct data_string *duid, const char *file, int line)
  	len = 4 + (ip->hw_address.hlen - 1);
  	if (duid_type == DUID_LLT)
  		len += 4;
@@ -122,5 +121,5 @@ index 8e57da9..ccc98e4 100644
  		putUShort(duid->buffer->data + 2, ip->hw_address.hbuf[0]);
  		putULong(duid->buffer->data + 4, cur_time - DUID_TIME_EPOCH);
 -- 
-2.14.5
+2.35.1
 

0017-Send-unicast-request-release-via-correct-interface.patch

@@ -1,8 +1,7 @@
-From 8a2b491f79aab1f04feac89586dfab1e55b47adb Mon Sep 17 00:00:00 2001
+From d45463c2007a78623f2c90c250bb8e2f3e34a852 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:39:36 +0100
-Subject: [PATCH 17/21] Send unicast request/release via correct interface
-Cc: pzhukov@redhat.com
+Subject: [PATCH 17/28] Send unicast request/release via correct interface
 
 (#800561, #1177351)
 (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #30544])
@@ -11,10 +10,10 @@ Cc: pzhukov@redhat.com
  1 file changed, 30 insertions(+)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index ccc98e4..27fde69 100644
+index 444d251..d607975 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -3171,6 +3171,14 @@ void send_request (cpp)
+@@ -3417,6 +3417,14 @@ void send_request (cpp)
  #endif
  	if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
  	    fallback_interface) {
@@ -29,7 +28,7 @@ index ccc98e4..27fde69 100644
  		result = send_packet(fallback_interface, NULL, &client->packet,
  				     client->packet_length, from, &destination,
  				     NULL);
-@@ -3180,6 +3188,13 @@ void send_request (cpp)
+@@ -3426,6 +3434,13 @@ void send_request (cpp)
  				  client->packet_length,
  				  fallback_interface->name);
  		}
@@ -43,7 +42,7 @@ index ccc98e4..27fde69 100644
          }
  	else {
  		/* Send out a packet. */
-@@ -3297,6 +3312,14 @@ void send_release (cpp)
+@@ -3543,6 +3558,14 @@ void send_release (cpp)
  	} else
  #endif
  	if (fallback_interface) {
@@ -58,7 +57,7 @@ index ccc98e4..27fde69 100644
  		result = send_packet(fallback_interface, NULL, &client->packet,
  				      client->packet_length, from, &destination,
  				      NULL);
-@@ -3306,6 +3329,13 @@ void send_release (cpp)
+@@ -3552,6 +3575,13 @@ void send_release (cpp)
  				  client->packet_length,
  				  fallback_interface->name);
  		}
@@ -73,5 +72,5 @@ index ccc98e4..27fde69 100644
  		/* Send out a packet. */
  		result = send_packet(client->interface, NULL, &client->packet,
 -- 
-2.14.5
+2.35.1
 

0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch

@@ -1,19 +1,18 @@
-From 588ead2d9a9cfe70f14569a8e950c6c42f15c1e3 Mon Sep 17 00:00:00 2001
+From 840c4f2175d14fa485f2a5e50a005847940b7e1f Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:40:51 +0100
-Subject: [PATCH 18/21] No subnet declaration for <iface>' should be info, not
+Subject: [PATCH 18/28] No subnet declaration for <iface>' should be info, not
  error.
-Cc: pzhukov@redhat.com
 
 ---
  common/discover.c | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/common/discover.c b/common/discover.c
-index 65881fc..056342c 100644
+index e562225..b4b1959 100644
 --- a/common/discover.c
 +++ b/common/discover.c
-@@ -801,9 +801,9 @@ discover_interfaces(int state) {
+@@ -806,9 +806,9 @@ discover_interfaces(int state) {
  
  		/* We must have a subnet declaration for each interface. */
  		if (!tmp->shared_network && (state == DISCOVER_SERVER)) {
@@ -22,10 +21,10 @@ index 65881fc..056342c 100644
  			if (local_family == AF_INET) {
 -				log_error("No subnet declaration for %s (%s).",
 +				log_info("No subnet declaration for %s (%s).",
- 					  tmp->name, 
+ 					  tmp->name,
  					  (tmp->addresses == NULL) ?
  					   "no IPv4 addresses" :
-@@ -818,26 +818,26 @@ discover_interfaces(int state) {
+@@ -823,26 +823,26 @@ discover_interfaces(int state) {
  				} else {
  					strcpy(abuf, "no IPv6 addresses");
  				}
@@ -59,5 +58,5 @@ index 65881fc..056342c 100644
  			} else {
  				log_error ("You must write a %s",
 -- 
-2.14.5
+2.35.1
 

0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch

@@ -1,9 +1,8 @@
-From 07b333c48a2fc99d7d502a0c88907b38f61c6230 Mon Sep 17 00:00:00 2001
+From eeb2e5bcedd62f21472da165b80741f8072420cf Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:41:14 +0100
-Subject: [PATCH 19/21] dhclient: write DUID_LLT even in stateless mode
+Subject: [PATCH 19/28] dhclient: write DUID_LLT even in stateless mode
  (#1156356)
-Cc: pzhukov@redhat.com
 
 (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #38144])
 ---
@@ -11,10 +10,10 @@ Cc: pzhukov@redhat.com
  1 file changed, 3 insertions(+)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 27fde69..4e5546a 100644
+index d607975..6bbefc7 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -1442,6 +1442,9 @@ void run_stateless(int exit_mode, u_int16_t port)
+@@ -1462,6 +1462,9 @@ void run_stateless(int exit_mode, u_int16_t port)
  			data_string_forget(&default_duid, MDL);
  
  		form_duid(&default_duid, MDL);
@@ -25,5 +24,5 @@ index 27fde69..4e5546a 100644
  
  #ifdef DHCP4o6
 -- 
-2.14.5
+2.35.1
 

0020-Discover-all-hwaddress-for-xid-uniqueness.patch

@@ -1,8 +1,7 @@
-From f1467835402eee90a350a952f1a411f37475a9df Mon Sep 17 00:00:00 2001
+From 908ea5f3a45a050a878de16d5acde6eda1b77d9f Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:42:50 +0100
-Subject: [PATCH 20/21] Discover all hwaddress for xid uniqueness
-Cc: pzhukov@redhat.com
+Subject: [PATCH 20/28] Discover all hwaddress for xid uniqueness
 
 ---
  common/discover.c |  2 ++
@@ -11,10 +10,10 @@ Cc: pzhukov@redhat.com
  3 files changed, 27 insertions(+), 5 deletions(-)
 
 diff --git a/common/discover.c b/common/discover.c
-index 056342c..e66e1c5 100644
+index b4b1959..96dcdcf 100644
 --- a/common/discover.c
 +++ b/common/discover.c
-@@ -648,6 +648,8 @@ discover_interfaces(int state) {
+@@ -653,6 +653,8 @@ discover_interfaces(int state) {
  			interface_dereference(&tmp, MDL);
  			tmp = interfaces; /* XXX */
  		}
@@ -24,10 +23,10 @@ index 056342c..e66e1c5 100644
  		if (dhcp_interface_discovery_hook) {
  			(*dhcp_interface_discovery_hook)(tmp);
 diff --git a/common/lpf.c b/common/lpf.c
-index b732a86..a708a5d 100644
+index fcaa13d..77a5668 100644
 --- a/common/lpf.c
 +++ b/common/lpf.c
-@@ -699,8 +699,22 @@ ioctl_get_ll(char *name)
+@@ -713,8 +713,22 @@ ioctl_get_ll(char *name)
  	return sll;
  }
  
@@ -50,7 +49,7 @@ index b732a86..a708a5d 100644
  {
  	struct hardware *hw = &info->hw_address;
  	char *name = info->name;
-@@ -710,7 +724,8 @@ get_hw_addr(struct interface_info *info)
+@@ -724,7 +738,8 @@ get_hw_addr(struct interface_info *info)
  	int sll_allocated = 0;
  	char *dup = NULL;
  	char *colon = NULL;
@@ -60,7 +59,7 @@ index b732a86..a708a5d 100644
  	if (getifaddrs(&ifaddrs) == -1)
  		log_fatal("Failed to get interfaces");
  
-@@ -794,14 +809,16 @@ get_hw_addr(struct interface_info *info)
+@@ -808,14 +823,16 @@ get_hw_addr(struct interface_info *info)
  			hw->hbuf[4] = 0xef;
  			break;
  #endif
@@ -82,10 +81,10 @@ index b732a86..a708a5d 100644
  }
  #endif
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 0c1a0aa..635c510 100644
+index e9e52e7..fabad01 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
-@@ -2637,7 +2637,10 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t);
+@@ -2653,7 +2653,10 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t);
  #endif
  const char *print_time(TIME);
  
@@ -97,5 +96,5 @@ index 0c1a0aa..635c510 100644
                     const char *file, int line);
  char *format_lease_id(const unsigned char *s, unsigned len, int format,
 -- 
-2.14.5
+2.35.1
 

0021-Load-leases-DB-in-non-replay-mode-only.patch

@@ -1,15 +1,14 @@
-From 1c7b876dc558774c40a2a28da53c19c65e123124 Mon Sep 17 00:00:00 2001
+From bdbbb4be07bb33fe083baef2bd0ef38b91c11120 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:44:06 +0100
-Subject: [PATCH 21/21] Load leases DB in non-replay mode only
-Cc: pzhukov@redhat.com
+Subject: [PATCH 21/28] Load leases DB in non-replay mode only
 
 ---
- server/confpars.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
+ server/confpars.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/server/confpars.c b/server/confpars.c
-index 2743979..db21a0b 100644
+index 5a6396b..6e08ad7 100644
 --- a/server/confpars.c
 +++ b/server/confpars.c
 @@ -134,6 +134,11 @@ isc_result_t read_conf_file (const char *filename, struct group *group,
@@ -17,35 +16,41 @@ index 2743979..db21a0b 100644
  	cfile = (struct parse *)0;
  #if defined (TRACING)
 +	// No need to dmalloc huge memory region if we're not going to re-play
-+	if (!trace_playback()){
++	if (!trace_record()){
 +		status = new_parse(&cfile, file, NULL, 0, filename, 0);
 +		goto noreplay;
 +	};
  	flen = lseek (file, (off_t)0, SEEK_END);
  	if (flen < 0) {
  	      boom:
-@@ -171,9 +176,11 @@ isc_result_t read_conf_file (const char *filename, struct group *group,
+@@ -165,7 +170,6 @@ isc_result_t read_conf_file (const char *filename, struct group *group,
+ 	if (result != ulen)
+ 		log_fatal ("%s: short read of %d bytes instead of %d.",
+ 			   filename, ulen, result);
+-	close (file);
+       memfile:
+ 	/* If we're recording, write out the filename and file contents. */
  	if (trace_record ())
- 		trace_write_packet (ttype, ulen + tflen + 1, dbuf, MDL);
- 	status = new_parse(&cfile, -1, fbuf, ulen, filename, 0); /* XXX */
-+	dfree(dbuf, MDL);
+@@ -174,6 +178,9 @@ isc_result_t read_conf_file (const char *filename, struct group *group,
  #else
  	status = new_parse(&cfile, file, NULL, 0, filename, 0);
  #endif
 +      noreplay:
++	if (!trace_playback())
++		close (file);
  	if (status != ISC_R_SUCCESS || cfile == NULL)
  		return status;
  
-@@ -182,9 +189,6 @@ isc_result_t read_conf_file (const char *filename, struct group *group,
- 	else
+@@ -183,7 +190,8 @@ isc_result_t read_conf_file (const char *filename, struct group *group,
  		status = conf_file_subparse (cfile, group, group_type);
  	end_parse (&cfile);
--#if defined (TRACING)
+ #if defined (TRACING)
 -	dfree (dbuf, MDL);
--#endif
++	if (trace_record())
++	    dfree (dbuf, MDL);
+ #endif
  	return status;
  }
- 
 -- 
-2.14.5
+2.35.1
 

0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch

@@ -0,0 +1,79 @@
+From 1f8681acba9ab70fbe17c85e5a1f4ce6a648b55d Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Thu, 28 Feb 2019 15:30:21 +0100
+Subject: [PATCH 22/28] dhclient: make sure link-local address is ready in
+ stateless mode
+
+Bug-url: https://bugzilla.redhat.com/1263466
+---
+ client/dhclient.c | 30 ++++++++++++++++++++----------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/client/dhclient.c b/client/dhclient.c
+index 6bbefc7..60836b4 100644
+--- a/client/dhclient.c
++++ b/client/dhclient.c
+@@ -943,6 +943,12 @@ main(int argc, char **argv) {
+ 
+ 	inaddr_any.s_addr = INADDR_ANY;
+ 
++	/* Discover all the network interfaces. */
++	discover_interfaces(DISCOVER_UNCONFIGURED);
++
++	/* Parse the dhclient.conf file. */
++	read_client_conf();
++
+ 	/* Stateless special case. */
+ 	if (stateless) {
+ 		if (release_mode || (wanted_ia_na > 0) ||
+@@ -959,12 +965,6 @@ main(int argc, char **argv) {
+ 		finish(0);
+ 	}
+ 
+-	/* Discover all the network interfaces. */
+-	discover_interfaces(DISCOVER_UNCONFIGURED);
+-
+-	/* Parse the dhclient.conf file. */
+-	read_client_conf();
+-
+ 	/* Parse any extra command line configuration arguments: */
+ 	if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) {
+ 		arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);
+@@ -1433,20 +1433,30 @@ void run_stateless(int exit_mode, u_int16_t port)
+ 	IGNORE_UNUSED(port);
+ #endif
+ 
+-	/* Discover the network interface. */
+-	discover_interfaces(DISCOVER_REQUESTED);
++	struct interface_info *ip;
+ 
+ 	if (!interfaces)
+ 		usage("No interfaces available for stateless command: %s", "-S");
+ 
+-	/* Parse the dhclient.conf file. */
+ #ifdef DHCP4o6
+ 	if (dhcpv4_over_dhcpv6) {
+ 		/* Mark we want to request IRT too! */
+ 		dhcpv4_over_dhcpv6++;
+ 	}
+ #endif
+-	read_client_conf();
++
++	for (ip = interfaces; ip; ip = ip->next) {
++		if ((interfaces_requested > 0) &&
++		    ((ip->flags & (INTERFACE_REQUESTED |
++				   INTERFACE_AUTOMATIC)) !=
++		     INTERFACE_REQUESTED))
++			continue;
++		script_init(ip->client, "PREINIT6", NULL);
++		script_go(ip->client);
++	}
++
++	/* Discover the network interface. */
++	discover_interfaces(DISCOVER_REQUESTED);
+ 
+ 	/* Parse the lease database. */
+ 	read_client_leases();
+-- 
+2.35.1
+

0023-option-97-pxe-client-id.patch

@@ -0,0 +1,246 @@
+From f01a29a90269c98a86accb0923d65aecf5f59b44 Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Thu, 28 Feb 2019 16:40:38 +0100
+Subject: [PATCH 23/28] option 97 - pxe-client-id
+
+Bug-url: https://bugzilla.redhat.com/1058674
+ISC-Bugs #38110
+---
+ common/options.c        | 27 ++++++++++++++++++++-------
+ common/tables.c         |  3 ++-
+ includes/dhcp.h         |  1 +
+ server/dhcp.c           | 19 +++++++++++++++++++
+ server/dhcpd.conf.5     |  9 ++++++---
+ server/dhcpleasequery.c | 18 +++++++++++++++---
+ server/failover.c       |  3 +++
+ server/mdb.c            |  5 +++--
+ 8 files changed, 69 insertions(+), 16 deletions(-)
+
+diff --git a/common/options.c b/common/options.c
+index 66433c4..4e26094 100644
+--- a/common/options.c
++++ b/common/options.c
+@@ -4551,13 +4551,26 @@ int validate_packet(struct packet *packet)
+ 				"a future version of ISC DHCP will reject this");
+ 		}
+ 	} else {
+-		/*
+-		 * If hlen is 0 we don't have any identifier, we warn the user
+-		 * but continue processing the packet as we can.
+-		 */
+-		if (packet->raw->hlen == 0) {
+-			log_debug("Received DHCPv4 packet without client-id"
+-				  " option and empty hlen field.");
++		oc = lookup_option (&dhcp_universe, packet->options,
++				    DHO_PXE_CLIENT_ID);
++		if (oc) {
++			/* Let's check if pxe-client-id is sane */
++			if ((oc->data.len < 2) ||
++			    (oc->data.data[0] == '\0' &&
++			     oc->data.len != 17)) {
++				log_debug("Dropped DHCPv4 packet with wrong "
++				    "(len == %d) pxe-client-id", oc->data.len);
++				return (0);
++			}
++		} else {
++			/*
++			 * If hlen is 0 we don't have any identifier, we warn the user
++			 * but continue processing the packet as we can.
++			 */
++			if (packet->raw->hlen == 0) {
++				log_debug("Received DHCPv4 packet without client-id"
++						" option and empty hlen field.");
++			}
+ 		}
+ 	}
+ 
+diff --git a/common/tables.c b/common/tables.c
+index 96521a6..8034d94 100644
+--- a/common/tables.c
++++ b/common/tables.c
+@@ -200,8 +200,9 @@ static struct option dhcp_options[] = {
+ 	/* Defined by RFC 4578 */
+ 	{ "pxe-system-type", "Sa",		&dhcp_universe,  93, 1 },
+ 	{ "pxe-interface-id", "BBB",		&dhcp_universe,  94, 1 },
+-	{ "pxe-client-id", "BX",		&dhcp_universe,  97, 1 },
+ #endif
++	{ "pxe-client-id", "BX",		&dhcp_universe,  97, 1 },
++
+ 	{ "uap-servers", "t",			&dhcp_universe,  98, 1 },
+ #if defined(RFC4776_OPTIONS)
+         { "geoconf-civic", "X",                 &dhcp_universe, 99, 1 },
+diff --git a/includes/dhcp.h b/includes/dhcp.h
+index 7202f1d..4ad3874 100644
+--- a/includes/dhcp.h
++++ b/includes/dhcp.h
+@@ -158,6 +158,7 @@ struct dhcp_packet {
+ #define DHO_AUTHENTICATE			90  /* RFC3118, was 210 */
+ #define DHO_CLIENT_LAST_TRANSACTION_TIME	91
+ #define DHO_ASSOCIATED_IP			92
++#define DHO_PXE_CLIENT_ID			97  /* RFC4578 */
+ #define DHO_V6_ONLY_PREFERRED			108 /* RFC8925 */
+ #define DHO_SUBNET_SELECTION			118 /* RFC3011! */
+ #define DHO_DOMAIN_SEARCH			119 /* RFC3397 */
+diff --git a/server/dhcp.c b/server/dhcp.c
+index 8363840..29d9c69 100644
+--- a/server/dhcp.c
++++ b/server/dhcp.c
+@@ -228,6 +228,10 @@ dhcp (struct packet *packet) {
+ 		if (lease -> uid_len) {
+ 			oc = lookup_option (&dhcp_universe, packet -> options,
+ 					    DHO_DHCP_CLIENT_IDENTIFIER);
++			if (!oc)
++				oc = lookup_option (&dhcp_universe,
++						    packet -> options,
++						    DHO_PXE_CLIENT_ID);
+ 			if (!oc)
+ 				goto nolease;
+ 
+@@ -826,6 +830,9 @@ void dhcprelease (packet, ms_nulltp)
+ 
+ 	oc = lookup_option (&dhcp_universe, packet -> options,
+ 			    DHO_DHCP_CLIENT_IDENTIFIER);
++	if (!oc)
++		oc = lookup_option (&dhcp_universe, packet -> options,
++				    DHO_PXE_CLIENT_ID);
+ 	memset (&data, 0, sizeof data);
+ 	if (oc &&
+ 	    evaluate_option_cache (&data, packet, (struct lease *)0,
+@@ -1338,6 +1345,9 @@ void dhcpinform (packet, ms_nulltp)
+          */
+ 	oc = lookup_option(&dhcp_universe, packet->options,
+ 			   DHO_DHCP_CLIENT_IDENTIFIER);
++	if (!oc)
++		oc = lookup_option (&dhcp_universe, packet -> options,
++				    DHO_PXE_CLIENT_ID);
+ 	memset(&d1, 0, sizeof(d1));
+ 	if (oc &&
+ 	    evaluate_option_cache(&d1, packet, NULL, NULL,
+@@ -2448,6 +2458,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
+ 		   can be used. */
+ 		oc = lookup_option (&dhcp_universe, packet -> options,
+ 				    DHO_DHCP_CLIENT_IDENTIFIER);
++		if (!oc)
++			oc = lookup_option (&dhcp_universe, packet -> options,
++					    DHO_PXE_CLIENT_ID);
+ 		if (oc &&
+ 		    evaluate_option_cache (&d1, packet, lease,
+ 					   (struct client_state *)0,
+@@ -3040,6 +3053,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
+ 		/* Record the uid, if given... */
+ 		oc = lookup_option (&dhcp_universe, packet -> options,
+ 				    DHO_DHCP_CLIENT_IDENTIFIER);
++		if (!oc)
++			oc = lookup_option (&dhcp_universe, packet -> options,
++					    DHO_PXE_CLIENT_ID);
+ 		if (oc &&
+ 		    evaluate_option_cache(&d1, packet, lease, NULL,
+ 					  packet->options, state->options,
+@@ -4258,6 +4274,9 @@ int find_lease (struct lease **lp,
+ 	   specified unique client identifier. */
+ 	oc = lookup_option (&dhcp_universe, packet -> options,
+ 			    DHO_DHCP_CLIENT_IDENTIFIER);
++	if (!oc)
++		oc = lookup_option (&dhcp_universe, packet -> options,
++				    DHO_PXE_CLIENT_ID);
+ 	memset (&client_identifier, 0, sizeof client_identifier);
+ 	if (oc &&
+ 	    evaluate_option_cache (&client_identifier,
+diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
+index b7e79ea..2354b1d 100644
+--- a/server/dhcpd.conf.5
++++ b/server/dhcpd.conf.5
+@@ -1664,10 +1664,12 @@ should be a name identifying the host.  If a \fIhostname\fR option is
+ not specified for the host, \fIhostname\fR is used.
+ .PP
+ \fIHost\fR declarations are matched to actual DHCP or BOOTP clients
+-by matching the \fRdhcp-client-identifier\fR option specified in the
++by matching the \fIdhcp-client-identifier\fR or \fIpxe-client-id\fR
++options specified in the
+ \fIhost\fR declaration to the one supplied by the client, or, if the
+ \fIhost\fR declaration or the client does not provide a
+-\fRdhcp-client-identifier\fR option, by matching the \fIhardware\fR
++\fIdhcp-client-identifier\fR or \fIpxe-client-id\fR options,
++by matching the \fIhardware\fR
+ parameter in the \fIhost\fR declaration to the network hardware
+ address supplied by the client.  BOOTP clients do not normally
+ provide a \fIdhcp-client-identifier\fR, so the hardware address must
+@@ -1679,7 +1681,8 @@ to identify hosts.
+ .PP
+ Please be aware that
+ .B only
+-the \fIdhcp-client-identifier\fR option and the hardware address can be
++the \fIdhcp-client-identifier\fR and \fIpxe-client-id\fR
++options and the hardware address can be
+ used to match a host declaration, or the \fIhost-identifier option\fR
+ parameter for DHCPv6 servers.  For example, it is not possible to
+ match a host declaration to a \fIhost-name\fR option.  This is
+diff --git a/server/dhcpleasequery.c b/server/dhcpleasequery.c
+index 0f1d4f7..dae4ae7 100644
+--- a/server/dhcpleasequery.c
++++ b/server/dhcpleasequery.c
+@@ -276,7 +276,7 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) {
+ 		 */
+ 
+ 		memset(&uid, 0, sizeof(uid));
+-		if (get_option(&uid, 
++		i = get_option(&uid,
+ 			       &dhcp_universe,
+ 			       packet,
+ 			       NULL,
+@@ -286,8 +286,20 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) {
+ 			       packet->options, 
+ 			       &global_scope,
+ 			       DHO_DHCP_CLIENT_IDENTIFIER,
+-			       MDL)) {
+-
++			       MDL);
++		if (!i)
++			i = get_option(&uid,
++				       &dhcp_universe,
++				       packet,
++				       NULL,
++				       NULL,
++				       packet->options,
++				       NULL,
++				       packet->options,
++				       &global_scope,
++				       DHO_PXE_CLIENT_ID,
++				       MDL);
++		if (i) {
+ 			snprintf(dbg_info, 
+ 				 sizeof(dbg_info), 
+ 				 "client-id %s",
+diff --git a/server/failover.c b/server/failover.c
+index 5b36d3a..a641e86 100644
+--- a/server/failover.c
++++ b/server/failover.c
+@@ -5988,6 +5988,9 @@ int load_balance_mine (struct packet *packet, dhcp_failover_state_t *state)
+ 
+ 	oc = lookup_option(&dhcp_universe, packet->options,
+ 			   DHO_DHCP_CLIENT_IDENTIFIER);
++	if (!oc)
++		oc = lookup_option(&dhcp_universe, packet -> options,
++				    DHO_PXE_CLIENT_ID);
+ 	memset(&ds, 0, sizeof ds);
+ 	if (oc &&
+ 	    evaluate_option_cache(&ds, packet, NULL, NULL,
+diff --git a/server/mdb.c b/server/mdb.c
+index 60a40e1..2cd5605 100644
+--- a/server/mdb.c
++++ b/server/mdb.c
+@@ -129,8 +129,9 @@ static int find_uid_statement (struct executable_statement *esp,
+ 	    esp -> data.option &&
+ 	    (esp -> data.option -> option -> universe ==
+ 	     &dhcp_universe) &&
+-	    (esp -> data.option -> option -> code ==
+-	     DHO_DHCP_CLIENT_IDENTIFIER)) {
++	    ((esp -> data.option -> option -> code ==
++						DHO_DHCP_CLIENT_IDENTIFIER) ||
++	     (esp -> data.option -> option -> code == DHO_PXE_CLIENT_ID))) {
+ 		if (condp) {
+ 			log_error ("dhcp client identifier may not be %s",
+ 				   "specified conditionally.");
+-- 
+2.35.1
+

0024-Detect-system-time-changes.patch

@@ -0,0 +1,92 @@
+From a2fb8759ab48c88e3f8df94ae6e156c357d932a2 Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Tue, 22 Oct 2019 16:23:01 +0200
+Subject: [PATCH 24/28] Detect system time changes
+
+---
+ client/dhclient.c |  6 ++++++
+ common/dispatch.c | 11 ++++++++++-
+ includes/dhcpd.h  |  3 ++-
+ server/dhcpd.c    |  6 ++++++
+ 4 files changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/client/dhclient.c b/client/dhclient.c
+index 60836b4..fd18813 100644
+--- a/client/dhclient.c
++++ b/client/dhclient.c
+@@ -5665,6 +5665,12 @@ isc_result_t dhcp_set_control_state (control_object_state_t oldstate,
+ 		  case server_awaken:
+ 		    state_reboot (client);
+ 		    break;
++
++                  case server_time_changed:
++                    if (client->active){
++                      state_reboot (client);
++                    }
++                    break;
+ 		}
+ 	    }
+ 	}
+diff --git a/common/dispatch.c b/common/dispatch.c
+index 9741ff5..11c1787 100644
+--- a/common/dispatch.c
++++ b/common/dispatch.c
+@@ -118,7 +118,6 @@ dispatch(void)
+ 		 * signal. It will return ISC_R_RELOAD in that
+ 		 * case. That is a normal behavior.
+ 		 */
+-
+ 		if (status == ISC_R_RELOAD) {
+ 			/*
+ 			 * dhcp_set_control_state() will do the job.
+@@ -129,6 +128,16 @@ dispatch(void)
+ 			if (status == ISC_R_SUCCESS)
+ 				status = ISC_R_RELOAD;
+ 		}
++
++                
++                if (status == ISC_R_TIMESHIFTED){
++                  status = dhcp_set_control_state(server_time_changed,
++                                                  server_time_changed);
++                  status = ISC_R_RELOAD;
++                  log_info ("System time has been changed. Unable to use existing leases. Restarting");
++                  // do nothing, restart context
++                };
++
+ 	} while (status == ISC_R_RELOAD);
+ 
+ 	log_fatal ("Dispatch routine failed: %s -- exiting",
+diff --git a/includes/dhcpd.h b/includes/dhcpd.h
+index fabad01..9663508 100644
+--- a/includes/dhcpd.h
++++ b/includes/dhcpd.h
+@@ -524,7 +524,8 @@ typedef enum {
+ 	server_running = 1,
+ 	server_shutdown = 2,
+ 	server_hibernate = 3,
+-	server_awaken = 4
++	server_awaken = 4,
++        server_time_changed = 5
+ } control_object_state_t;
+ 
+ typedef struct {
+diff --git a/server/dhcpd.c b/server/dhcpd.c
+index 845d0cc..3b3bd3b 100644
+--- a/server/dhcpd.c
++++ b/server/dhcpd.c
+@@ -1767,6 +1767,12 @@ isc_result_t dhcp_set_control_state (control_object_state_t oldstate,
+ {
+ 	struct timeval tv;
+ 
++        if (newstate == server_time_changed){
++          log_error ("System time has been changed. Leases information unreliable!");
++          return ISC_R_SUCCESS;
++        }
++
++                
+ 	if (newstate != server_shutdown)
+ 		return DHCP_R_INVALIDARG;
+ 	/* Re-entry. */
+-- 
+2.35.1
+

0025-bind-Detect-system-time-changes.patch

@@ -0,0 +1,196 @@
+From 8e49f4b460ad20890c63a385c17d3e5decd45a82 Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Tue, 22 Oct 2019 16:23:24 +0200
+Subject: [PATCH 25/28] bind: Detect system time changes
+
+---
+ .../bind-9.11.36/lib/isc/include/isc/result.h |  4 +-
+ bind/bind-9.11.36/lib/isc/include/isc/util.h  |  4 ++
+ bind/bind-9.11.36/lib/isc/result.c            |  2 +
+ bind/bind-9.11.36/lib/isc/unix/app.c          | 41 +++++++++++++++++--
+ .../lib/isc/unix/include/isc/time.h           | 20 +++++++++
+ bind/bind-9.11.36/lib/isc/unix/time.c         | 22 ++++++++++
+ 6 files changed, 89 insertions(+), 4 deletions(-)
+
+diff --git a/bind/bind-9.11.36/lib/isc/include/isc/result.h b/bind/bind-9.11.36/lib/isc/include/isc/result.h
+index 916641f..51c2468 100644
+--- a/bind/bind-9.11.36/lib/isc/include/isc/result.h
++++ b/bind/bind-9.11.36/lib/isc/include/isc/result.h
+@@ -89,7 +89,9 @@
+ #define ISC_R_DISCFULL			67	/*%< disc full */
+ #define ISC_R_DEFAULT			68	/*%< default */
+ #define ISC_R_IPV4PREFIX		69	/*%< IPv4 prefix */
+-#define ISC_R_NRESULTS 			70
++#define ISC_R_TIMESHIFTED               70      /*%< system time changed */
++/*% Not a result code: the number of results. */
++#define ISC_R_NRESULTS 			71
+ 
+ ISC_LANG_BEGINDECLS
+ 
+diff --git a/bind/bind-9.11.36/lib/isc/include/isc/util.h b/bind/bind-9.11.36/lib/isc/include/isc/util.h
+index 9111c2a..20a05b4 100644
+--- a/bind/bind-9.11.36/lib/isc/include/isc/util.h
++++ b/bind/bind-9.11.36/lib/isc/include/isc/util.h
+@@ -325,6 +325,10 @@ extern void mock_assert(const int result, const char* const expression,
+  * Time
+  */
+ #define TIME_NOW(tp) 	RUNTIME_CHECK(isc_time_now((tp)) == ISC_R_SUCCESS)
++#ifdef CLOCK_BOOTTIME
++#define TIME_MONOTONIC(tp) 	RUNTIME_CHECK(isc_time_boottime((tp)) == ISC_R_SUCCESS)
++#endif
++
+ 
+ /*%
+  * Alignment
+diff --git a/bind/bind-9.11.36/lib/isc/result.c b/bind/bind-9.11.36/lib/isc/result.c
+index 887b08c..2106a3a 100644
+--- a/bind/bind-9.11.36/lib/isc/result.c
++++ b/bind/bind-9.11.36/lib/isc/result.c
+@@ -105,6 +105,7 @@ static const char *description[ISC_R_NRESULTS] = {
+ 	"disc full",				/*%< 67 */
+ 	"default",				/*%< 68 */
+ 	"IPv4 prefix",				/*%< 69 */
++        "time changed",                         /*%< 70 */
+ };
+ 
+ static const char *identifier[ISC_R_NRESULTS] = {
+@@ -178,6 +179,7 @@ static const char *identifier[ISC_R_NRESULTS] = {
+ 	"ISC_R_DISCFULL",
+ 	"ISC_R_DEFAULT",
+ 	"ISC_R_IPV4PREFIX",
++        "ISC_R_TIMESHIFTED",
+ };
+ 
+ #define ISC_RESULT_RESULTSET			2
+diff --git a/bind/bind-9.11.36/lib/isc/unix/app.c b/bind/bind-9.11.36/lib/isc/unix/app.c
+index 8189c63..4aabaa4 100644
+--- a/bind/bind-9.11.36/lib/isc/unix/app.c
++++ b/bind/bind-9.11.36/lib/isc/unix/app.c
+@@ -442,15 +442,51 @@ isc__app_ctxonrun(isc_appctx_t *ctx0, isc_mem_t *mctx, isc_task_t *task,
+ static isc_result_t
+ evloop(isc__appctx_t *ctx) {
+ 	isc_result_t result;
++        isc_time_t now;
++#ifdef CLOCK_BOOTTIME
++        isc_time_t monotonic;
++        uint64_t diff  = 0;
++#else
++        isc_time_t prev;
++        TIME_NOW(&prev);
++#endif
++
++
++
+ 
+ 	while (!ctx->want_shutdown) {
+ 		int n;
+-		isc_time_t when, now;
++		isc_time_t when;
++                
+ 		struct timeval tv, *tvp;
+ 		isc_socketwait_t *swait;
+ 		bool readytasks;
+ 		bool call_timer_dispatch = false;
+ 
++                uint64_t us; 
++
++#ifdef CLOCK_BOOTTIME
++                // TBD macros for following three lines
++                TIME_NOW(&now);
++                TIME_MONOTONIC(&monotonic);
++                INSIST(now.seconds > monotonic.seconds)
++                us = isc_time_microdiff (&now, &monotonic);
++                if (us < diff){ 
++                  us = diff - us;
++                  if (us > 1000000){ // ignoring shifts less than one second
++                    return ISC_R_TIMESHIFTED;
++                  };
++                  diff = isc_time_microdiff (&now, &monotonic);
++                } else {
++                  diff = isc_time_microdiff (&now, &monotonic);
++                  // not implemented
++                }
++#else
++                TIME_NOW(&now);
++                if (isc_time_compare (&now, &prev) < 0)
++                  return ISC_R_TIMESHIFTED;
++                TIME_NOW(&prev);
++#endif                
+ 		/*
+ 		 * Check the reload (or suspend) case first for exiting the
+ 		 * loop as fast as possible in case:
+@@ -475,9 +511,8 @@ evloop(isc__appctx_t *ctx) {
+ 			if (result != ISC_R_SUCCESS)
+ 				tvp = NULL;
+ 			else {
+-				uint64_t us;
+-
+ 				TIME_NOW(&now);
++
+ 				us = isc_time_microdiff(&when, &now);
+ 				if (us == 0)
+ 					call_timer_dispatch = true;
+diff --git a/bind/bind-9.11.36/lib/isc/unix/include/isc/time.h b/bind/bind-9.11.36/lib/isc/unix/include/isc/time.h
+index 03512c1..99e0dfa 100644
+--- a/bind/bind-9.11.36/lib/isc/unix/include/isc/time.h
++++ b/bind/bind-9.11.36/lib/isc/unix/include/isc/time.h
+@@ -132,6 +132,26 @@ isc_time_isepoch(const isc_time_t *t);
+  *\li	't' is a valid pointer.
+  */
+ 
++#ifdef CLOCK_BOOTTIME
++isc_result_t
++isc_time_boottime(isc_time_t *t);
++/*%<
++ * Set 't' to monotonic time from previous boot
++ * it's not affected by system time change. It also
++ * includes the time system was suspended
++ *
++ * Requires:
++ *\li	't' is a valid pointer.
++ *
++ * Returns:
++ *
++ *\li	Success
++ *\li	Unexpected error
++ *		Getting the time from the system failed.
++ */
++#endif /* CLOCK_BOOTTIME */
++ 
++
+ isc_result_t
+ isc_time_now(isc_time_t *t);
+ /*%<
+diff --git a/bind/bind-9.11.36/lib/isc/unix/time.c b/bind/bind-9.11.36/lib/isc/unix/time.c
+index bcca41b..af6ea7f 100644
+--- a/bind/bind-9.11.36/lib/isc/unix/time.c
++++ b/bind/bind-9.11.36/lib/isc/unix/time.c
+@@ -498,3 +498,25 @@ isc_time_formatISO8601ms(const isc_time_t *t, char *buf, unsigned int len) {
+ 			 t->nanoseconds / NS_PER_MS);
+ 	}
+ }
++
++
++#ifdef CLOCK_BOOTTIME
++isc_result_t
++isc_time_boottime(isc_time_t *t) {
++  struct timespec ts;
++  
++  char strbuf[ISC_STRERRORSIZE];
++
++  if (clock_gettime (CLOCK_BOOTTIME, &ts) != 0){
++    isc__strerror(errno, strbuf, sizeof(strbuf));
++    UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", strbuf);
++    return (ISC_R_UNEXPECTED);    
++  }
++
++  t->seconds = ts.tv_sec;
++  t->nanoseconds = ts.tv_nsec;
++
++  return (ISC_R_SUCCESS);
++  
++};
++#endif
+-- 
+2.35.1
+

0026-Add-dhclient-5-B-option-description.patch

@@ -0,0 +1,29 @@
+From aa328eef58ff93110f2a52cb3a80002ab8cee36e Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Tue, 22 Oct 2019 16:28:04 +0200
+Subject: [PATCH 26/28] Add dhclient(5) -B option description
+
+Bug-Url: https://bugzilla.redhat.com/1764088
+---
+ client/dhclient.8 | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/client/dhclient.8 b/client/dhclient.8
+index bacf3bc..76f0cc0 100644
+--- a/client/dhclient.8
++++ b/client/dhclient.8
+@@ -553,6 +553,11 @@ Path to the network configuration script invoked by
+ when it gets a lease.  If unspecified, the default
+ .B CLIENTBINDIR/dhclient-script
+ is used.  See \fBdhclient-script(8)\fR for a description of this file.
++.TP
++.BI \-B
++Always set the bootp broadcast flag in request packets, so that
++servers will always broadcast replies. This option is provided as
++an extension to enable dhclient to work on IBM s390 Linux guests.
+ .PP
+ .SH PORTS
+ During operations the client may use multiple UDP ports
+-- 
+2.35.1
+

0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch

@@ -0,0 +1,96 @@
+From d1b1f91a7982be28acdfb580996c93aafcc76cc2 Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Thu, 7 Nov 2019 14:47:45 +0100
+Subject: [PATCH 27/28] Add missed sd notify patch to manage dhcpd with systemd
+
+---
+ configure.ac     | 11 +++++++++++
+ relay/dhcrelay.c | 12 ++++++++++++
+ server/dhcpd.c   | 12 ++++++++++++
+ 3 files changed, 35 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 300117f..f644e71 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1005,6 +1005,17 @@ if test x$ldap = xyes || test x$ldapcrypto = xyes || test x$ldap_gssapi = xyes;
+     AC_SUBST(LDAP_CFLAGS, [$LDAP_CFLAGS])
+ fi
+ 
++AC_ARG_WITH(systemd,
++        AC_HELP_STRING([--with-systemd],
++                       [enable sending status notifications to systemd daemon (default is no)]),
++        [systemd=$withval],
++        [systemd=no])
++
++if test x$systemd = xyes ; then
++   AC_CHECK_LIB(systemd, sd_notifyf, ,
++                AC_MSG_FAILURE([*** systemd library not present - do you need to install systemd-libs package?]))
++fi
++
+ # Append selected warning levels to CFLAGS before substitution (but after
+ # AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) & etc).
+ CFLAGS="$CFLAGS $STD_CWARNINGS"
+diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
+index 0dc17d6..d3ad31e 100644
+--- a/relay/dhcrelay.c
++++ b/relay/dhcrelay.c
+@@ -37,6 +37,10 @@
+    int keep_capabilities = 0;
+ #endif
+ 
++#ifdef HAVE_LIBSYSTEMD
++#include <systemd/sd-daemon.h>
++#endif
++
+ TIME default_lease_time = 43200; /* 12 hours... */
+ TIME max_lease_time = 86400; /* 24 hours... */
+ struct tree_cache *global_options[256];
+@@ -869,6 +873,14 @@ main(int argc, char **argv) {
+ 	}
+ #endif
+ 
++#ifdef HAVE_LIBSYSTEMD
++        /* We are ready to process incomming packets. Let's notify systemd */
++        sd_notifyf(0, "READY=1\n"
++                   "STATUS=Dispatching packets...\n"
++                   "MAINPID=%lu",
++                   (unsigned long) getpid());
++#endif
++
+ 	/* Start dispatching packets and timeouts... */
+ 	dispatch();
+ 
+diff --git a/server/dhcpd.c b/server/dhcpd.c
+index 3b3bd3b..9223d5b 100644
+--- a/server/dhcpd.c
++++ b/server/dhcpd.c
+@@ -60,6 +60,10 @@ gid_t set_gid = 0;
+ struct class unknown_class;
+ struct class known_class;
+ 
++#ifdef HAVE_LIBSYSTEMD
++#include <systemd/sd-daemon.h>
++#endif
++
+ struct iaddr server_identifier;
+ int server_identifier_matched;
+ 
+@@ -1057,6 +1061,14 @@ main(int argc, char **argv) {
+ 	/* Log that we are about to start working */
+ 	log_info("Server starting service.");
+ 
++#ifdef HAVE_LIBSYSTEMD
++        /* We are ready to process incomming packets. Let's notify systemd */
++        sd_notifyf(0, "READY=1\n"
++                   "STATUS=Dispatching packets...\n"
++                   "MAINPID=%lu",
++                   (unsigned long) getpid());
++#endif
++
+ 	/*
+ 	 * Receive packets and dispatch them...
+ 	 * dispatch() will never return.
+-- 
+2.35.1
+

0028-Use-system-getaddrinfo-for-dhcp.patch

@@ -0,0 +1,117 @@
+From 9970114f558927564d9c19be969c3c35db3b0edf Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Tue, 22 Jun 2021 06:58:40 +0200
+Subject: [PATCH 28/28] Use system getaddrinfo for dhcp
+
+---
+ .../lib/irs/include/irs/netdb.h.in            | 94 +++++++++++++++++++
+ 1 file changed, 94 insertions(+)
+
+diff --git a/bind/bind-9.11.36/lib/irs/include/irs/netdb.h.in b/bind/bind-9.11.36/lib/irs/include/irs/netdb.h.in
+index 427fef8..74069b5 100644
+--- a/bind/bind-9.11.36/lib/irs/include/irs/netdb.h.in
++++ b/bind/bind-9.11.36/lib/irs/include/irs/netdb.h.in
+@@ -150,6 +150,100 @@ struct addrinfo {
+ #define	NI_NUMERICSERV	0x00000008
+ #define	NI_DGRAM	0x00000010
+ 
++/*
++ * Define to map into irs_ namespace.
++ */
++
++#define IRS_NAMESPACE
++
++#ifdef IRS_NAMESPACE
++
++/*
++ * Use our versions not the ones from the C library.
++ */
++
++#ifdef getnameinfo
++#undef getnameinfo
++#endif
++#define getnameinfo irs_getnameinfo
++
++#ifdef getaddrinfo
++#undef getaddrinfo
++#endif
++#define getaddrinfo irs_getaddrinfo
++
++#ifdef freeaddrinfo
++#undef freeaddrinfo
++#endif
++#define freeaddrinfo irs_freeaddrinfo
++
++#ifdef gai_strerror
++#undef gai_strerror
++#endif
++#define gai_strerror irs_gai_strerror
++
++#endif
++
++extern int getaddrinfo (const char *name,
++			const char *service,
++			const struct addrinfo *req,
++			struct addrinfo **pai);
++extern int getnameinfo (const struct sockaddr *sa,
++			socklen_t salen, char *host,
++			socklen_t hostlen, char *serv,
++			socklen_t servlen, int flags);
++extern void freeaddrinfo (struct addrinfo *ai);
++extern const char *gai_strerror (int ecode);
++
++/*
++ * Define to map into irs_ namespace.
++ */
++
++#define IRS_NAMESPACE
++
++#ifdef IRS_NAMESPACE
++
++/*
++ * Use our versions not the ones from the C library.
++ */
++
++#ifdef getnameinfo
++#undef getnameinfo
++#endif
++#define getnameinfo irs_getnameinfo
++
++#ifdef getaddrinfo
++#undef getaddrinfo
++#endif
++#define getaddrinfo irs_getaddrinfo
++
++#ifdef freeaddrinfo
++#undef freeaddrinfo
++#endif
++#define freeaddrinfo irs_freeaddrinfo
++
++#ifdef gai_strerror
++#undef gai_strerror
++#endif
++#define gai_strerror irs_gai_strerror
++
++int
++getaddrinfo(const char *hostname, const char *servname,
++	    const struct addrinfo *hints, struct addrinfo **res);
++
++int
++getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen,
++	    char *host, IRS_GETNAMEINFO_BUFLEN_T hostlen,
++	    char *serv, IRS_GETNAMEINFO_BUFLEN_T servlen,
++	    IRS_GETNAMEINFO_FLAGS_T flags);
++
++void freeaddrinfo (struct addrinfo *ai);
++
++IRS_GAISTRERROR_RETURN_T
++gai_strerror(int ecode);
++
++#endif
++
+ /*
+  * Tell Emacs to use C mode on this file.
+  * Local variables:
+-- 
+2.35.1
+

0030-bind-configure-c99.patch

@@ -0,0 +1,151 @@
+Downstream-only patch.
+Upstream bind9 development has changed configure significantly:
+https://gitlab.isc.org/isc-projects/bind9
+
+From 035224d94d4cf93257cf5440a2e4e129540e81e8 Mon Sep 17 00:00:00 2001
+From: Arjun Shankar <arjun@redhat.com>
+Date: Thu, 20 Apr 2023 15:34:01 +0200
+Subject: [PATCH] Port to C99
+
+---
+ bind/bind-9.11.36/configure    | 14 +++++++-------
+ bind/bind-9.11.36/configure.ac | 14 +++++++-------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/bind/bind-9.11.36/configure b/bind/bind-9.11.36/configure
+index 368112f..c50d873 100755
+--- a/bind/bind-9.11.36/configure
++++ b/bind/bind-9.11.36/configure
+@@ -20016,7 +20016,7 @@ else
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-main() {
++int main() {
+ char a[16],b[64]; return(inet_ntop(AF_INET6, a, b, sizeof(b)) == (char*)0);}
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+@@ -20056,7 +20056,7 @@ else
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 :
++int main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 :
+ 			     inet_pton(AF_INET, "1.2.3.04", a) == 1 ? 1 :
+ 			     (inet_pton(AF_INET6, "::1.2.3.4", a) != 1)); }
+ _ACEOF
+@@ -21346,7 +21346,7 @@ else
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}
++int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5
+@@ -21363,7 +21363,7 @@ else
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}
++int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: long int" >&5
+@@ -21380,7 +21380,7 @@ else
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}
++int main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: long long int" >&5
+@@ -21759,7 +21759,7 @@ int
+ main ()
+ {
+ 
+-				main() { asm("ics"); exit(0); }
++				int main() { asm("ics"); exit(0); }
+ 
+   ;
+   return 0;
+@@ -21782,7 +21782,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-				main() { asm("ics"); exit(0); }
++				int main() { asm("ics"); exit(0); }
+ 
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+diff --git a/bind/bind-9.11.36/configure.ac b/bind/bind-9.11.36/configure.ac
+index 030c4d7..e74af09 100644
+--- a/bind/bind-9.11.36/configure.ac
++++ b/bind/bind-9.11.36/configure.ac
+@@ -3274,7 +3274,7 @@ AC_TRY_RUN([
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-main() {
++int main() {
+ char a[16],b[64]; return(inet_ntop(AF_INET6, a, b, sizeof(b)) == (char*)0);}],
+ 	[AC_MSG_RESULT(yes)
+ 	ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP"],
+@@ -3297,7 +3297,7 @@ AC_TRY_RUN([
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 :
++int main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 :
+ 			     inet_pton(AF_INET, "1.2.3.04", a) == 1 ? 1 :
+ 			     (inet_pton(AF_INET6, "::1.2.3.4", a) != 1)); }],
+ 	[AC_MSG_RESULT(yes)
+@@ -3901,7 +3901,7 @@ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}],
++int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}],
+ [AC_MSG_RESULT(int)
+ ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE int"],
+ [
+@@ -3909,7 +3909,7 @@ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}],
++int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}],
+ [AC_MSG_RESULT(long int)
+ ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long int"],
+ [
+@@ -3917,7 +3917,7 @@ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}],
++int main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}],
+ [AC_MSG_RESULT(long long int)
+ ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int"],
+ [AC_MSG_ERROR([unable to determine sizeof rlim_cur])
+@@ -4117,7 +4117,7 @@ case "$enable_atomic" in
+ 			if test "X$GCC" = "Xyes"; then
+ 				AC_MSG_CHECKING([if asm("ics"); works])
+ 				AC_TRY_COMPILE(,[
+-				main() { asm("ics"); exit(0); }
++				int main() { asm("ics"); exit(0); }
+ 				],
+ 				[AC_MSG_RESULT(yes)
+ 				 use_atomic=yes],
+@@ -4125,7 +4125,7 @@ case "$enable_atomic" in
+ 				saved_cflags="$CFLAGS"
+ 				CFLAGS="$CFLAGS -Wa,-many"
+ 				AC_TRY_RUN([
+-				main() { asm("ics"); exit(0); }
++				int main() { asm("ics"); exit(0); }
+ 				],
+ 				[AC_MSG_RESULT([yes, required -Wa,-many])
+ 				 use_atomic=yes],
+-- 
+2.40.0
+

0031-Correct-declarations-of-ia_na_-no-match-and-ia_pd_-n.patch

@@ -0,0 +1,39 @@
+From f7eb324f5b0deef285b0eaa0d504af77f06c779f Mon Sep 17 00:00:00 2001
+From: Stepan Broz <sbroz@redhat.com>
+Date: Fri, 24 Jan 2025 15:41:41 +0100
+Subject: [PATCH] Correct declarations of ia_na_[no]match and ia_pd_[no]match
+ in server/dhcpv6.c.
+
+---
+ server/dhcpv6.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/server/dhcpv6.c b/server/dhcpv6.c
+index 7d61dc5..c1f227c 100644
+--- a/server/dhcpv6.c
++++ b/server/dhcpv6.c
+@@ -5852,8 +5852,8 @@ iterate_over_ia_na(struct data_string *reply_ret,
+ 		   const struct data_string *client_id,
+ 		   const struct data_string *server_id,
+ 		   const char *packet_type,
+-		   void (*ia_na_match)(),
+-		   void (*ia_na_nomatch)())
++		   void (*ia_na_match)(const struct data_string *, const struct data_string *, struct iasubopt *),
++		   void (*ia_na_nomatch)(const struct data_string *, const struct data_string *, u_int32_t *, struct packet *, char *, int *, int))
+ {
+ 	struct option_state *opt_state;
+ 	struct host_decl *packet_host;
+@@ -6354,8 +6354,8 @@ iterate_over_ia_pd(struct data_string *reply_ret,
+ 		   const struct data_string *client_id,
+ 		   const struct data_string *server_id,
+ 		   const char *packet_type,
+-		   void (*ia_pd_match)(),
+-		   void (*ia_pd_nomatch)())
++		   void (*ia_pd_match)(const struct data_string *, const struct data_string *, struct iasubopt *),
++		   void (*ia_pd_nomatch)(const struct data_string *, const struct data_string *, u_int32_t *, struct packet *, char *, int *, int))
+ {
+ 	struct data_string reply_new;
+ 	int reply_len;
+-- 
+2.48.1
+

12-dhcpd

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-## this script is disabled by default
-## if you want one to be executed  on NM up events
-## please make it executable. See chmod(1) for more details
-
-INTERFACE=$1 # The interface which is brought up or down
-STATUS=$2 # The new state of the interface
-
-# whenever interface is brought up by NM (rhbz #565921)
-if [ "$STATUS" = "up" ]; then
-    # wait a few seconds to allow interface startup to complete
-    # (important at boot time without this the service still fails
-    # time-out for dispatcher script is 3s (rhbz#1003695#8)
-    sleep 2
-    # restart the services
-    # In case this dispatcher script is called several times in a short period of time, it might happen that
-    # systemd refuses to further restart the units. Therefore we use reset-failed command to prevent it.
-    systemctl -q is-enabled dhcpd.service && systemctl restart dhcpd.service && systemctl reset-failed dhcpd.service
-    systemctl -q is-enabled dhcpd6.service && systemctl restart dhcpd6.service && systemctl reset-failed dhcpd6.service
-fi
-
-exit 0

CVE-2021-25220.patch

@@ -0,0 +1,200 @@
+diff --git a/bind/bind-9.11.36/lib/dns/resolver.c b/bind/bind-9.11.36/lib/dns/resolver.c
+index b34cb12..8ae9a99 100644
+--- a/bind/bind-9.11.36/lib/dns/resolver.c
++++ b/bind/bind-9.11.36/lib/dns/resolver.c
+@@ -63,6 +63,7 @@
+ #include <dns/stats.h>
+ #include <dns/tsig.h>
+ #include <dns/validator.h>
++#include <dns/zone.h>
+ 
+ #ifdef WANT_QUERYTRACE
+ #define RTRACE(m)       isc_log_write(dns_lctx, \
+@@ -311,6 +312,8 @@ struct fetchctx {
+ 	bool			ns_ttl_ok;
+ 	uint32_t			ns_ttl;
+ 	isc_counter_t *			qc;
++	dns_fixedname_t			fwdfname;
++	dns_name_t			*fwdname;
+ 
+ 	/*%
+ 	 * The number of events we're waiting for.
+@@ -3389,6 +3392,7 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) {
+ 		if (result == ISC_R_SUCCESS) {
+ 			fwd = ISC_LIST_HEAD(forwarders->fwdrs);
+ 			fctx->fwdpolicy = forwarders->fwdpolicy;
++			dns_name_copy(domain, fctx->fwdname, NULL);
+ 			if (fctx->fwdpolicy == dns_fwdpolicy_only &&
+ 			    isstrictsubdomain(domain, &fctx->domain)) {
+ 				fcount_decr(fctx);
+@@ -4418,6 +4422,9 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
+ 	fctx->restarts = 0;
+ 	fctx->querysent = 0;
+ 	fctx->referrals = 0;
++
++	fctx->fwdname = dns_fixedname_initname(&fctx->fwdfname);
++
+ 	TIME_NOW(&fctx->start);
+ 	fctx->timeouts = 0;
+ 	fctx->lamecount = 0;
+@@ -4476,8 +4483,10 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
+ 		domain = dns_fixedname_initname(&fixed);
+ 		result = dns_fwdtable_find2(fctx->res->view->fwdtable, fwdname,
+ 					    domain, &forwarders);
+-		if (result == ISC_R_SUCCESS)
++		if (result == ISC_R_SUCCESS) {
+ 			fctx->fwdpolicy = forwarders->fwdpolicy;
++			dns_name_copy(domain, fctx->fwdname, NULL);
++		}
+ 
+ 		if (fctx->fwdpolicy != dns_fwdpolicy_only) {
+ 			/*
+@@ -6226,6 +6235,112 @@ mark_related(dns_name_t *name, dns_rdataset_t *rdataset,
+ 		rdataset->attributes |= DNS_RDATASETATTR_EXTERNAL;
+ }
+ 
++/*
++ * Returns true if 'name' is external to the namespace for which
++ * the server being queried can answer, either because it's not a
++ * subdomain or because it's below a forward declaration or a
++ * locally served zone.
++ */
++static inline bool
++name_external(dns_name_t *name, dns_rdatatype_t type, fetchctx_t *fctx) {
++	isc_result_t result;
++	dns_forwarders_t *forwarders = NULL;
++	dns_fixedname_t fixed, zfixed;
++	dns_name_t *fname = dns_fixedname_initname(&fixed);
++	dns_name_t *zfname = dns_fixedname_initname(&zfixed);
++	dns_name_t *apex = NULL;
++	dns_name_t suffix;
++	dns_zone_t *zone = NULL;
++	unsigned int labels;
++	dns_namereln_t rel;
++	/*
++	 * The following two variables do not influence code flow; they are
++	 * only necessary for calling dns_name_fullcompare().
++	 */
++	int _orderp = 0;
++	unsigned int _nlabelsp = 0;
++
++	apex = ISFORWARDER(fctx->addrinfo) ? fctx->fwdname : &fctx->domain;
++
++	/*
++	 * The name is outside the queried namespace.
++	 */
++	rel = dns_name_fullcompare(name, apex, &_orderp, &_nlabelsp);
++	if (rel != dns_namereln_subdomain && rel != dns_namereln_equal) {
++		return (true);
++	}
++
++	/*
++	 * If the record lives in the parent zone, adjust the name so we
++	 * look for the correct zone or forward clause.
++	 */
++	labels = dns_name_countlabels(name);
++	if (dns_rdatatype_atparent(type) && labels > 1U) {
++		dns_name_init(&suffix, NULL);
++		dns_name_getlabelsequence(name, 1, labels - 1, &suffix);
++		name = &suffix;
++	} else if (rel == dns_namereln_equal) {
++		/* If 'name' is 'apex', no further checking is needed. */
++		return (false);
++	}
++
++	/*
++	 * If there is a locally served zone between 'apex' and 'name'
++	 * then don't cache.
++	 */
++	LOCK(&fctx->res->view->lock);
++	if (fctx->res->view->zonetable != NULL) {
++		unsigned int options = DNS_ZTFIND_NOEXACT;
++		result = dns_zt_find(fctx->res->view->zonetable, name, options,
++				     zfname, &zone);
++		if (zone != NULL) {
++			dns_zone_detach(&zone);
++		}
++		if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
++			if (dns_name_fullcompare(zfname, apex, &_orderp,
++						 &_nlabelsp) ==
++			    dns_namereln_subdomain)
++			{
++				UNLOCK(&fctx->res->view->lock);
++				return (true);
++			}
++		}
++	}
++	UNLOCK(&fctx->res->view->lock);
++
++	/*
++	 * Look for a forward declaration below 'name'.
++	 */
++	result = dns_fwdtable_find2(fctx->res->view->fwdtable, name, fname,
++				    &forwarders);
++
++	if (ISFORWARDER(fctx->addrinfo)) {
++		/*
++		 * See if the forwarder declaration is better.
++		 */
++		if (result == ISC_R_SUCCESS) {
++			return (!dns_name_equal(fname, fctx->fwdname));
++		}
++
++		/*
++		 * If the lookup failed, the configuration must have
++		 * changed: play it safe and don't cache.
++		 */
++		return (true);
++	} else if (result == ISC_R_SUCCESS &&
++		   forwarders->fwdpolicy == dns_fwdpolicy_only &&
++		   !ISC_LIST_EMPTY(forwarders->fwdrs))
++	{
++		/*
++		 * If 'name' is covered by a 'forward only' clause then we
++		 * can't cache this repsonse.
++		 */
++		return (true);
++	}
++
++	return (false);
++}
++
+ static isc_result_t
+ check_section(void *arg, dns_name_t *addname, dns_rdatatype_t type,
+ 	      dns_section_t section)
+@@ -6254,7 +6369,7 @@ check_section(void *arg, dns_name_t *addname, dns_rdatatype_t type,
+ 	result = dns_message_findname(rmessage, section, addname,
+ 				      dns_rdatatype_any, 0, &name, NULL);
+ 	if (result == ISC_R_SUCCESS) {
+-		external = !dns_name_issubdomain(name, &fctx->domain);
++		external = name_external(name, type, fctx);
+ 		if (type == dns_rdatatype_a) {
+ 			for (rdataset = ISC_LIST_HEAD(name->list);
+ 			     rdataset != NULL;
+@@ -7136,6 +7251,13 @@ answer_response(fetchctx_t *fctx, dns_message_t *message) {
+ 			break;
+ 
+ 		case dns_namereln_subdomain:
++			/*
++			 * Don't accept DNAME from parent namespace.
++			 */
++			if (name_external(name, dns_rdatatype_dname, fctx)) {
++				continue;
++			}
++
+ 			/*
+ 			 * In-scope DNAME records must have at least
+ 			 * as many labels as the domain being queried.
+@@ -7371,11 +7493,9 @@ answer_response(fetchctx_t *fctx, dns_message_t *message) {
+ 	 */
+ 	result = dns_message_firstname(message, DNS_SECTION_AUTHORITY);
+ 	while (!done && result == ISC_R_SUCCESS) {
+-		bool external;
+ 		name = NULL;
+ 		dns_message_currentname(message, DNS_SECTION_AUTHORITY, &name);
+-		external = !dns_name_issubdomain(name, &fctx->domain);
+-		if (!external) {
++		if (!name_external(name, dns_rdatatype_ns, fctx)) {
+ 			/*
+ 			 * We expect to find NS or SIG NS rdatasets, and
+ 			 * nothing else.

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

codesign2021.txt

@@ -0,0 +1,534 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=fX+D
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+4xcYgqlVpv15O7VrD+I=
+=Uugw
+-----END PGP PUBLIC KEY BLOCK-----

gating.yaml

@@ -0,0 +1,25 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+
+#Rawhide
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+
+#gating rhel
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

plans.fmf

@@ -0,0 +1,35 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/dhcp.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/dhcp.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/dhcp.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/dhcp.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/dhcp.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/dhcp.git
+      name: /plans/others/public

rpminspect.yaml

@@ -0,0 +1,22 @@
+---
+badfuncs:
+  # Adding waiver for all these functions to stop rpminspec to complain about them.
+  # The DHCP is EOL software so there is no chance to get them replaced
+  # with alternatives upstream.
+  allowed:
+    /usr/bin/omshell:
+      - gethostbyname
+      - inet_ntoa
+    /usr/sbin/dhcpd:
+      - gethostbyaddr
+      - gethostbyname
+      - inet_ntoa
+    /usr/sbin/dhclient:
+      - gethostbyname
+      - inet_ntoa
+    /usr/sbin/dhcrelay:
+      - gethostbyname
+      - inet_ntoa
+    /usr/sbin/keama:
+      - gethostbyname
+

sources

@@ -1 +1,2 @@
-SHA512 (dhcp-4.4.1.tar.gz) = 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
+SHA512 (dhcp-4.4.3-P1.tar.gz) = d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154
+SHA512 (dhcp-4.4.3-P1.tar.gz.asc) = b24a81eda6fea2727e520d83c52ef25717db3a7c05b55f6e61f03cbf484e8b17b46ef11f2c46b223f30014866f32ed4170f223ce1d2233c63d7a6cfd7f9fa444

systemd-sysusers.conf

@@ -0,0 +1,3 @@
+#Type Name     ID             GECOS                 Home directory Shell
+g     dhcpd    177
+u     dhcpd    177            "DHCP server"         /              /sbin/nologin

systemd-tmpfiles.conf

@@ -0,0 +1 @@
+d /var/lib/dhcpd 0755 dhcpd dhcpd -