summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/dhclient/dhclient.c6
-rw-r--r--sbin/dhclient/packet.c4
2 files changed, 4 insertions, 6 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index b01714edb26..efc4f0dad17 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.97 2006/12/28 00:51:19 stevesk Exp $ */
+/* $OpenBSD: dhclient.c,v 1.98 2006/12/28 01:10:46 stevesk Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -1227,7 +1227,7 @@ cancel:
correctly. */
if (client->state == S_REBOOTING &&
!client->medium &&
- client->active->medium ) {
+ client->active->medium) {
script_init("MEDIUM", client->active->medium);
/* If the medium we chose won't fly, go to INIT state. */
@@ -1392,7 +1392,6 @@ make_discover(struct client_lease *lease)
ifi->hw_address.hlen);
}
-
void
make_request(struct client_lease * lease)
{
@@ -2164,7 +2163,6 @@ ipv4addrs(char * buf)
return (0);
}
-
char *
option_as_string(unsigned int code, unsigned char *data, int len)
{
diff --git a/sbin/dhclient/packet.c b/sbin/dhclient/packet.c
index 174178b845f..815ef411ed4 100644
--- a/sbin/dhclient/packet.c
+++ b/sbin/dhclient/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.11 2006/12/26 21:19:52 krw Exp $ */
+/* $OpenBSD: packet.c,v 1.12 2006/12/28 01:10:46 stevesk Exp $ */
/* Packet assembly code, originally contributed by Archie Cobbs. */
@@ -86,7 +86,7 @@ wrapsum(u_int32_t sum)
}
void
-assemble_hw_header( unsigned char *buf, int *bufix, struct hardware *to)
+assemble_hw_header(unsigned char *buf, int *bufix, struct hardware *to)
{
struct ether_header eh;