summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-02-14 23:19:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-02-14 23:19:27 +0000
commitb988dd0e2d7472f9c1c1c5b733df829714bb0549 (patch)
tree442c03ad9c89eacca7eeac2ad3bd9556e5b8c55e
parent1aa01010ee8f964bd80ee09776fe8b9211c06543 (diff)
spacing and a typo that fell out of the read
-rw-r--r--sbin/dhclient/clparse.c4
-rw-r--r--sbin/dhclient/options.c6
-rw-r--r--sbin/dhclient/privsep.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index 056ce872f8b..aa485361d00 100644
--- a/sbin/dhclient/clparse.c
+++ b/sbin/dhclient/clparse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clparse.c,v 1.33 2006/12/27 20:56:33 krw Exp $ */
+/* $OpenBSD: clparse.c,v 1.34 2007/02/14 23:19:26 deraadt Exp $ */
/* Parser for dhclient config and lease files... */
@@ -135,7 +135,7 @@ read_client_leases(void)
* TOK_SEND option-decl |
* TOK_DEFAULT option-decl |
* TOK_SUPERSEDE option-decl |
- * TOK_APPEND option-decl
+ * TOK_APPEND option-decl |
* TOK_PREPEND option-decl |
* TOK_MEDIA string-list |
* hardware-declaration |
diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c
index b6b3094ded2..03480881f3b 100644
--- a/sbin/dhclient/options.c
+++ b/sbin/dhclient/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.33 2007/01/25 01:21:04 krw Exp $ */
+/* $OpenBSD: options.c,v 1.34 2007/02/14 23:19:26 deraadt Exp $ */
/* DHCP options parsing and reassembly. */
@@ -444,7 +444,7 @@ do_packet(int len, unsigned int from_port, struct iaddr from,
options_valid = parse_option_buffer(options,
&packet->options[4], sizeof(packet->options) - 4);
- /* Only DHCP packets have overload areas for options. */
+ /* Only DHCP packets have overload areas for options. */
if (options_valid &&
options[DHO_DHCP_MESSAGE_TYPE].data &&
options[DHO_DHCP_OPTION_OVERLOAD].data) {
@@ -492,7 +492,7 @@ do_packet(int len, unsigned int from_port, struct iaddr from,
handler = NULL;
}
- if (handler)
+ if (handler)
(*handler)(from, options);
for (i = 0; i < 256; i++)
diff --git a/sbin/dhclient/privsep.c b/sbin/dhclient/privsep.c
index 2ae9a3bd6f1..d9a06bec216 100644
--- a/sbin/dhclient/privsep.c
+++ b/sbin/dhclient/privsep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: privsep.c,v 1.12 2005/10/07 13:19:40 pedro Exp $ */
+/* $OpenBSD: privsep.c,v 1.13 2007/02/14 23:19:26 deraadt Exp $ */
/*
* Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -76,7 +76,7 @@ buf_read(int sock, void *buf, size_t nbytes)
do {
n = read(sock, buf, nbytes);
- if (n == 0) /* connection closed */
+ if (n == 0) /* connection closed */
error("buf_read (connection closed)");
if (n != -1 && n < nbytes)
error("buf_read (short read): %m");