components/isc-dhcp/patches/ignore-client-uids.patch
author Stacey Marshall <Stacey.Marshall@Oracle.COM>
Mon, 16 Jun 2014 10:40:59 +0100
branchs11u1-sru
changeset 3187 53638237a55f
permissions -rw-r--r--
18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3187
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
     1
The following patch is adopted from ISC DHCP version 4.3.0.
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
     2
http://ftp.isc.org/isc/dhcp/4.3.0/dhcp-4.3.0.tar.gz
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
     3
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
     4
--- dhcp-4.1-ESV-R7/server/stables.c.orig	Thu Aug 23 19:23:54 2012
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
     5
+++ dhcp-4.1-ESV-R7/server/stables.c	Mon Apr 28 16:37:14 2014
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
     6
@@ -244,6 +244,7 @@
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
     7
 	{ "delayed-ack", "S",			&server_universe,  58, 1 },
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
     8
 	{ "max-ack-delay", "L",			&server_universe,  59, 1 },
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
     9
 #endif
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    10
+	{ "ignore-client-uids", "f",		&server_universe,  60, 1 },
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    11
 	{ NULL, NULL, NULL, 0, 0 }
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    12
 };
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    13
 
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    14
--- dhcp-4.1-ESV-R7/server/dhcp.c.orig	Thu Aug 23 19:23:54 2012
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    15
+++ dhcp-4.1-ESV-R7/server/dhcp.c	Mon Apr 28 16:36:18 2014
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    16
@@ -2304,31 +2304,40 @@
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    17
 	/* Update Client Last Transaction Time. */
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    18
 	lt->cltt = cur_time;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    19
 
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    20
-	/* Record the uid, if given... */
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    21
-	oc = lookup_option (&dhcp_universe, packet -> options,
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    22
-			    DHO_DHCP_CLIENT_IDENTIFIER);
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    23
-	if (oc &&
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    24
-	    evaluate_option_cache (&d1, packet, lease,
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    25
-				   (struct client_state *)0,
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    26
-				   packet -> options, state -> options,
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    27
-				   &lease -> scope, oc, MDL)) {
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    28
-		if (d1.len <= sizeof lt -> uid_buf) {
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    29
-			memcpy (lt -> uid_buf, d1.data, d1.len);
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    30
-			lt -> uid = lt -> uid_buf;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    31
-			lt -> uid_max = sizeof lt -> uid_buf;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    32
-			lt -> uid_len = d1.len;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    33
-		} else {
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    34
-			unsigned char *tuid;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    35
-			lt -> uid_max = d1.len;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    36
-			lt -> uid_len = d1.len;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    37
-			tuid = (unsigned char *)dmalloc (lt -> uid_max, MDL);
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    38
-			/* XXX inelegant */
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    39
-			if (!tuid)
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    40
-				log_fatal ("no memory for large uid.");
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    41
-			memcpy (tuid, d1.data, lt -> uid_len);
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    42
-			lt -> uid = tuid;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    43
+	/* See if we want to record the uid for this client */
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    44
+	oc = lookup_option(&server_universe, state->options,
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    45
+	    SV_IGNORE_CLIENT_UIDS);
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    46
+	if ((oc == NULL) ||
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    47
+	    !evaluate_boolean_option_cache(&ignorep, packet, lease, NULL,
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    48
+		packet->options, state->options,
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    49
+		&lease->scope, oc, MDL)) {
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    50
+
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    51
+		/* Record the uid, if given... */
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    52
+		oc = lookup_option (&dhcp_universe, packet -> options,
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    53
+		    DHO_DHCP_CLIENT_IDENTIFIER);
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    54
+		if (oc &&
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    55
+		    evaluate_option_cache (&d1, packet, lease,
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    56
+			(struct client_state *)0,
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    57
+			packet -> options, state -> options,
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    58
+			&lease -> scope, oc, MDL)) {
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    59
+			if (d1.len <= sizeof lt -> uid_buf) {
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    60
+				memcpy (lt -> uid_buf, d1.data, d1.len);
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    61
+				lt -> uid = lt -> uid_buf;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    62
+				lt -> uid_max = sizeof lt -> uid_buf;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    63
+				lt -> uid_len = d1.len;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    64
+			} else {
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    65
+				unsigned char *tuid;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    66
+				lt -> uid_max = d1.len;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    67
+				lt -> uid_len = d1.len;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    68
+				tuid = (unsigned char *)dmalloc (lt -> uid_max, MDL);
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    69
+				/* XXX inelegant */
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    70
+				if (!tuid)
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    71
+					log_fatal ("no memory for large uid.");
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    72
+				memcpy (tuid, d1.data, lt -> uid_len);
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    73
+				lt -> uid = tuid;
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    74
+			}
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    75
+			data_string_forget (&d1, MDL);
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    76
 		}
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    77
-		data_string_forget (&d1, MDL);
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    78
 	}
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    79
 
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    80
 	if (host) {
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    81
--- dhcp-4.1-ESV-R7/server/dhcpd.conf.5.orig	Wed May  7 18:37:36 2014
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    82
+++ dhcp-4.1-ESV-R7/server/dhcpd.conf.5	Wed May  7 18:38:46 2014
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    83
@@ -2302,6 +2302,19 @@
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    84
 must be a constant value.
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    85
 .RE
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    86
 .PP
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    87
+The
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    88
+.I ignore-client-uids
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    89
+statement
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    90
+.RS 0.25i
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    91
+.PP
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    92
+.B ignore-client-uids \fIflag\fB;\fR
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    93
+.PP
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    94
+If the \fIignore-client-uids\fR statement is present and has a value of
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    95
+\fItrue\fR or \fIon\fR, the UID for clients will not be recorded.
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    96
+If this statement is not present or has a value of \fIfalse\fR or
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    97
+\fIoff\fR, then client UIDs will be recorded.
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    98
+.RE
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
    99
+.PP
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   100
 The
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   101
 .I infinite-is-reserved
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   102
 statement
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   103
--- dhcp-4.1-ESV-R7/includes/dhcpd.h.orig	Thu Aug 23 19:23:53 2012
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   104
+++ dhcp-4.1-ESV-R7/includes/dhcpd.h	Mon Apr 28 16:11:17 2014
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   105
@@ -627,6 +627,7 @@
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   106
 #define SV_LIMIT_PREFS_PER_IA		57
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   107
 #define SV_DELAYED_ACK			58
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   108
 #define SV_MAX_ACK_DELAY		59
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   109
+#define SV_IGNORE_CLIENT_UIDS		60
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   110
 
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   111
 #if !defined (DEFAULT_PING_TIMEOUT)
53638237a55f 18677735 ISC DHCP needs option to ignore client UID to get along with AI install and PXE
Stacey Marshall <Stacey.Marshall@Oracle.COM>
parents:
diff changeset
   112
 # define DEFAULT_PING_TIMEOUT 1