diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-10-04 22:47:52 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-10-04 22:47:52 +0000 |
| commit | 1bb8187d13ecb23226782d96df36aa609ddf3e0a (patch) | |
| tree | 8a317b56500e6a5fb4312eb7dd77daa17cd60dfb /usr.sbin | |
| parent | 3c5e64c110f4a0b74cd54b98992daefb117b04a5 (diff) | |
Zap stray whitespace.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/dhcpd/dhcp.c | 10 | ||||
| -rw-r--r-- | usr.sbin/dhcpd/options.c | 8 | ||||
| -rw-r--r-- | usr.sbin/dhcpd/sync.c | 4 | ||||
| -rw-r--r-- | usr.sbin/dhcpd/sync.h | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/usr.sbin/dhcpd/dhcp.c b/usr.sbin/dhcpd/dhcp.c index 2bef0107575..52e67af487e 100644 --- a/usr.sbin/dhcpd/dhcp.c +++ b/usr.sbin/dhcpd/dhcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcp.c,v 1.46 2016/08/05 14:02:23 krw Exp $ */ +/* $OpenBSD: dhcp.c,v 1.47 2016/10/04 22:47:51 krw Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 1998, 1999 @@ -343,15 +343,15 @@ dhcprequest(struct packet *packet) return; } - /* + /* * Do not ACK a REQUEST intended for another server. - */ + */ if (packet->options[DHO_DHCP_SERVER_IDENTIFIER].len == 4) { if (memcmp(packet->options[DHO_DHCP_SERVER_IDENTIFIER].data, &packet->interface->primary_address, 4)) return; - } - + } + /* * If we own the lease that the client is asking for, * and it's already been assigned to the client, ack it. diff --git a/usr.sbin/dhcpd/options.c b/usr.sbin/dhcpd/options.c index ce9c7ff30ba..eae11f2fcd0 100644 --- a/usr.sbin/dhcpd/options.c +++ b/usr.sbin/dhcpd/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.31 2016/08/05 14:02:23 krw Exp $ */ +/* $OpenBSD: options.c,v 1.32 2016/10/04 22:47:51 krw Exp $ */ /* DHCP options parsing and reassembly. */ @@ -248,16 +248,16 @@ create_priority_list(unsigned char *priority_list, unsigned char *prl, for(i = 0; i < prl_len; i++) { if (stored_list[prl[i]]) continue; - priority_list[priority_len++] = prl[i]; + priority_list[priority_len++] = prl[i]; stored_list[prl[i]] = 1; - } + } /* Default priority list. */ prl = dhcp_option_default_priority_list; for(i = 0; i < 256; i++) { if (stored_list[prl[i]]) continue; - priority_list[priority_len++] = prl[i]; + priority_list[priority_len++] = prl[i]; stored_list[prl[i]] = 1; } } diff --git a/usr.sbin/dhcpd/sync.c b/usr.sbin/dhcpd/sync.c index 30c097cd04a..95cbb8ea4d2 100644 --- a/usr.sbin/dhcpd/sync.c +++ b/usr.sbin/dhcpd/sync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sync.c,v 1.17 2016/02/06 23:50:10 krw Exp $ */ +/* $OpenBSD: sync.c,v 1.18 2016/10/04 22:47:51 krw Exp $ */ /* * Copyright (c) 2008 Bob Beck <beck@openbsd.org> @@ -355,7 +355,7 @@ sync_send(struct iovec *iov, int iovlen) { struct sync_host *shost; struct msghdr msg; - + if (syncfd == -1) return; diff --git a/usr.sbin/dhcpd/sync.h b/usr.sbin/dhcpd/sync.h index 7338a8e659f..2e09aee861d 100644 --- a/usr.sbin/dhcpd/sync.h +++ b/usr.sbin/dhcpd/sync.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sync.h,v 1.4 2013/04/13 18:08:47 krw Exp $ */ +/* $OpenBSD: sync.h,v 1.5 2016/10/04 22:47:51 krw Exp $ */ /* * Copyright (c) 2008, Bob Beck <beck@openbsd.org> @@ -24,11 +24,11 @@ * dhcpd(8) synchronisation protocol. * * This protocol has been designed for realtime synchronisation between - * multiple machines running dhcpd(8), running the same config. + * multiple machines running dhcpd(8), running the same config. * It is a simple Type-Length-Value based protocol, it allows easy * extension with future subtypes and bulk transfers by sending multiple * entries at once. The unencrypted messages will be authenticated using - * HMAC-SHA1. + * HMAC-SHA1. * */ |