|
Lines 1-5
Link Here
|
| 1 |
--- client/dhclient.c.orig 2008-01-22 17:28:23.000000000 +0000 |
1 |
--- client/dhclient.c.orig 2008-01-22 12:28:23.000000000 -0500 |
| 2 |
+++ client/dhclient.c 2008-05-26 08:17:53.000000000 +0000 |
2 |
+++ client/dhclient.c 2009-07-15 15:02:28.000000000 -0400 |
| 3 |
@@ -38,6 +38,13 @@ |
3 |
@@ -38,6 +38,13 @@ |
| 4 |
#include "dhcpd.h" |
4 |
#include "dhcpd.h" |
| 5 |
#include "version.h" |
5 |
#include "version.h" |
|
Lines 242-248
Link Here
|
| 242 |
add_timeout (cur_time + client -> interval, |
242 |
add_timeout (cur_time + client -> interval, |
| 243 |
send_request, client, 0, 0); |
243 |
send_request, client, 0, 0); |
| 244 |
} |
244 |
} |
| 245 |
@@ -2624,6 +2734,13 @@ |
245 |
@@ -2509,8 +2619,9 @@ |
|
|
246 |
(struct option_state *)0, |
| 247 |
lease -> options, |
| 248 |
&global_scope, oc, MDL)) { |
| 249 |
- if (data.len > 3) { |
| 250 |
- struct iaddr netmask, subnet, broadcast; |
| 251 |
+ struct iaddr netmask; |
| 252 |
+ if (data.len > 3 && data.len <= sizeof(netmask.iabuf)) { |
| 253 |
+ struct iaddr subnet, broadcast; |
| 254 |
|
| 255 |
memcpy (netmask.iabuf, data.data, data.len); |
| 256 |
netmask.len = data.len; |
| 257 |
@@ -2624,6 +2735,13 @@ |
| 246 |
*/ |
258 |
*/ |
| 247 |
if (leaseFile != NULL) |
259 |
if (leaseFile != NULL) |
| 248 |
fclose(leaseFile); |
260 |
fclose(leaseFile); |
|
Lines 256-262
Link Here
|
| 256 |
execve (scriptName, argv, envp); |
268 |
execve (scriptName, argv, envp); |
| 257 |
log_error ("execve (%s, ...): %m", scriptName); |
269 |
log_error ("execve (%s, ...): %m", scriptName); |
| 258 |
exit (0); |
270 |
exit (0); |
| 259 |
@@ -2810,8 +2927,10 @@ |
271 |
@@ -2810,8 +2928,10 @@ |
| 260 |
case S_STOPPED: |
272 |
case S_STOPPED: |
| 261 |
break; |
273 |
break; |
| 262 |
} |
274 |
} |
|
Lines 267-273
Link Here
|
| 267 |
} |
279 |
} |
| 268 |
} |
280 |
} |
| 269 |
} |
281 |
} |
| 270 |
@@ -3039,7 +3158,9 @@ |
282 |
@@ -3039,7 +3159,9 @@ |
| 271 |
break; |
283 |
break; |
| 272 |
|
284 |
|
| 273 |
case server_awaken: |
285 |
case server_awaken: |
|
Lines 277-283
Link Here
|
| 277 |
break; |
289 |
break; |
| 278 |
} |
290 |
} |
| 279 |
} |
291 |
} |
| 280 |
@@ -3177,3 +3298,265 @@ |
292 |
@@ -3177,3 +3299,265 @@ |
| 281 |
data_string_forget (&ddns_dhcid, MDL); |
293 |
data_string_forget (&ddns_dhcid, MDL); |
| 282 |
return rcode; |
294 |
return rcode; |
| 283 |
} |
295 |
} |