Blame SOURCES/dhcp-prepend.patch

fad460
diff -up dhcp-4.2.5/client/dhc6.c.prepend dhcp-4.2.5/client/dhc6.c
fad460
--- dhcp-4.2.5/client/dhc6.c.prepend	2016-04-18 14:21:41.062502036 +0200
fad460
+++ dhcp-4.2.5/client/dhc6.c	2016-04-18 14:25:11.683732506 +0200
fad460
@@ -595,7 +595,7 @@ dhc6_dup_addr(struct dhc6_addr *addr, co
fad460
  * Parsed options are deleted in order to not save them in the lease file.
fad460
  */
fad460
 static struct dhc6_lease *
fad460
-dhc6_leaseify(struct packet *packet)
fad460
+dhc6_leaseify(struct packet *packet, struct client_state* client)
fad460
 {
fad460
 	struct data_string ds;
fad460
 	struct dhc6_lease *lease;
fad460
@@ -687,6 +687,11 @@ dhc6_leaseify(struct packet *packet)
fad460
 				      lease->server_id.data, 52));
fad460
 	}
fad460
 
fad460
+	execute_statements_in_scope(NULL, (struct packet *)packet, NULL,
fad460
+				    client, lease->options, lease->options,
fad460
+				    &global_scope, client->config->on_receipt,
fad460
+				    NULL);
fad460
+
fad460
 	return lease;
fad460
 }
fad460
 
fad460
@@ -2892,7 +2897,7 @@ init_handler(struct packet *packet, stru
fad460
 		return;
fad460
 	}
fad460
 
fad460
-	lease = dhc6_leaseify(packet);
fad460
+	lease = dhc6_leaseify(packet, client);
fad460
 
fad460
 	if (dhc6_check_advertise(lease) != ISC_R_SUCCESS) {
fad460
 		log_debug("PRC: Lease failed to satisfy.");
fad460
@@ -2975,6 +2980,12 @@ info_request_handler(struct packet *pack
fad460
 	option_state_reference(&client->active_lease->options,
fad460
 			       packet->options, MDL);
fad460
 
fad460
+	execute_statements_in_scope(NULL, (struct packet *)packet, NULL, client,
fad460
+				    client->active_lease->options,
fad460
+				    client->active_lease->options,
fad460
+				    &global_scope, client->config->on_receipt,
fad460
+				    NULL);
fad460
+
fad460
 	start_informed(client);
fad460
 }
fad460
 
fad460
@@ -3009,7 +3020,7 @@ rapid_commit_handler(struct packet *pack
fad460
 		return;
fad460
 	}
fad460
 
fad460
-	lease = dhc6_leaseify(packet);
fad460
+	lease = dhc6_leaseify(packet, client);
fad460
 
fad460
 	/* This is an out of memory condition...hopefully a temporary
fad460
 	 * problem.  Returning now makes us try to retransmit later.
fad460
@@ -3823,7 +3834,7 @@ reply_handler(struct packet *packet, str
fad460
 		return;
fad460
 	}
fad460
 
fad460
-	lease = dhc6_leaseify(packet);
fad460
+	lease = dhc6_leaseify(packet, client);
fad460
 
fad460
 	/* This is an out of memory condition...hopefully a temporary
fad460
 	 * problem.  Returning now makes us try to retransmit later.
fad460
diff -up dhcp-4.2.5/RELNOTES.prepend dhcp-4.2.5/RELNOTES