diff options
Diffstat (limited to 'sbin/dhclient/dhclient.c')
| -rw-r--r-- | sbin/dhclient/dhclient.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 773c7668c67..f20370e3a27 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.257 2013/06/18 17:02:41 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.258 2013/07/05 22:13:10 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -1856,7 +1856,7 @@ fork_privchld(int fd, int fd2) quit = INTERNALSIG; } continue; - } + } if (nfds == 0 || !(pfd[0].revents & POLLIN)) continue; @@ -1910,7 +1910,7 @@ fork_privchld(int fd, int fd2) if (quit != INTERNALSIG) warning("%s; exiting", strsignal(quit)); - + exit(1); } @@ -2063,7 +2063,7 @@ apply_defaults(struct client_lease *lease) if (newlease->options[i].len != 0) free(newlease->options[i].data); newlease->options[i].len = config->defaults[i].len; - newlease->options[i].data = calloc(1, + newlease->options[i].data = calloc(1, config->defaults[i].len); if (newlease->options[i].data == NULL) goto cleanup; @@ -2082,7 +2082,7 @@ apply_defaults(struct client_lease *lease) goto cleanup; memcpy(newlease->options[i].data, config->defaults[i].data, config->defaults[i].len); - memcpy(newlease->options[i].data + + memcpy(newlease->options[i].data + config->defaults[i].len, lease->options[i].data, lease->options[i].len); break; @@ -2098,7 +2098,7 @@ apply_defaults(struct client_lease *lease) goto cleanup; memcpy(newlease->options[i].data, lease->options[i].data, lease->options[i].len); - memcpy(newlease->options[i].data + + memcpy(newlease->options[i].data + lease->options[i].len, config->defaults[i].data, config->defaults[i].len); break; @@ -2108,7 +2108,7 @@ apply_defaults(struct client_lease *lease) (config->defaults[i].len != 0)) { newlease->options[i].len = config->defaults[i].len; - newlease->options[i].data = calloc(1, + newlease->options[i].data = calloc(1, config->defaults[i].len); if (newlease->options[i].data == NULL) goto cleanup; @@ -2330,7 +2330,7 @@ add_default_route(int rdomain, struct in_addr addr, struct in_addr gateway) flags |= RTF_GATEWAY | RTF_STATIC; } - add_route(rdomain, dest, netmask, gateway, addrs, flags); + add_route(rdomain, dest, netmask, gateway, addrs, flags); } void @@ -2372,7 +2372,7 @@ void add_classless_static_routes(int rdomain, memset(&netmask, 0, sizeof(netmask)); if (bits) - netmask.s_addr = htonl(0xffffffff << (32 - bits)); + netmask.s_addr = htonl(0xffffffff << (32 - bits)); memset(&dest, 0, sizeof(dest)); memcpy(&dest, &classless_static_routes->data[i], bytes); |