dhcp: Update to 4.3.5b1

[people/arne_f/ipfire-3.x.git] / dhcp / patches / 0018-dhcp-honor-expired.patch

diff --git a/dhcp/patches/dhcp-4.2.0-honor-expired.patch b/dhcp/patches/0018-dhcp-honor-expired.patch
similarity index 77%
rename from dhcp/patches/dhcp-4.2.0-honor-expired.patch
rename to dhcp/patches/0018-dhcp-honor-expired.patch
index 0ae9128481f42b9d9e0935f727fe37b16dc1c4a0..bd892975be1baa06e52b16f9293e978e2d4c9f53 100644 (file)
--- a/dhcp/patches/dhcp-4.2.0-honor-expired.patch
+++ b/dhcp/patches/0018-dhcp-honor-expired.patch
@@ -1,7 +1,7 @@
-diff -up dhcp-4.2.0/client/dhc6.c.honor-expired dhcp-4.2.0/client/dhc6.c
---- dhcp-4.2.0/client/dhc6.c.honor-expired     2010-10-07 12:55:37.000000000 +0200
-+++ dhcp-4.2.0/client/dhc6.c   2010-10-07 12:56:43.000000000 +0200
-@@ -1405,6 +1405,32 @@ start_info_request6(struct client_state 
+diff -up dhcp-4.3.0a1/client/dhc6.c.honor-expired dhcp-4.3.0a1/client/dhc6.c
+--- dhcp-4.3.0a1/client/dhc6.c.honor-expired   2013-12-19 16:00:28.062183037 +0100
++++ dhcp-4.3.0a1/client/dhc6.c 2013-12-19 16:00:28.076182842 +0100
+@@ -1351,6 +1351,32 @@ start_info_request6(struct client_state
                go_daemon();
  }
  
@@ -34,7 +34,7 @@ diff -up dhcp-4.2.0/client/dhc6.c.honor-expired dhcp-4.2.0/client/dhc6.c
  /*
   * start_confirm6() kicks off an "init-reboot" version of the process, at
   * startup to find out if old bindings are 'fair' and at runtime whenever
-@@ -1417,8 +1446,10 @@ start_confirm6(struct client_state *clie
+@@ -1363,8 +1389,10 @@ start_confirm6(struct client_state *clie
  
        /* If there is no active lease, there is nothing to check. */
        if ((client->active_lease == NULL) ||