Package: wide-dhcpv6 / 20080615-22

0010-Call-client-script-after-interfaces-have-been-update.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
From: Jeremie Corbier <jeremie@famille-corbier.net>
Date: Tue, 2 Dec 2014 11:18:52 +0100
Subject: Call client script after interfaces have been updated

Closes: #734644

Signed-off-by: Jeremie Corbier <jeremie@famille-corbier.net>
---
 dhcp6c.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dhcp6c.c b/dhcp6c.c
index ccb601c..1d10a78 100644
--- a/dhcp6c.c
+++ b/dhcp6c.c
@@ -1854,15 +1854,6 @@ client6_recvreply(ifp, dh6, len, optinfo)
 	}
 
 	/*
-	 * Call the configuration script, if specified, to handle various
-	 * configuration parameters.
-	 */
-	if (ifp->scriptpath != NULL && strlen(ifp->scriptpath) != 0) {
-		debug_printf(LOG_DEBUG, FNAME, "executes %s", ifp->scriptpath);
-		client6_script(ifp->scriptpath, state, optinfo);
-	}
-
-	/*
 	 * Set refresh timer for configuration information specified in
 	 * information-request.  If the timer value is specified by the server
 	 * in an information refresh time option, use it; use the protocol
@@ -1927,6 +1918,15 @@ client6_recvreply(ifp, dh6, len, optinfo)
 		check_exit();
 	}
 
+	/*
+	 * Call the configuration script, if specified, to handle various
+	 * configuration parameters.
+	 */
+	if (ifp->scriptpath != NULL && strlen(ifp->scriptpath) != 0) {
+		debug_printf(LOG_DEBUG, FNAME, "executes %s", ifp->scriptpath);
+		client6_script(ifp->scriptpath, state, optinfo);
+	}
+
 	debug_printf(LOG_DEBUG, FNAME, "got an expected reply, sleeping.");
 
 	if (infreq_mode) {