summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2004-05-05 22:21:03 +0000
committerderaadt <deraadt@openbsd.org>2004-05-05 22:21:03 +0000
commit161ad1e2e011031abd77a4206810128e7bce8da1 (patch)
tree537ae7055e8f31b09418e9f72622e76b2792025b
parentuse strtonum all over the place; ok pb millert (diff)
downloadwireguard-openbsd-161ad1e2e011031abd77a4206810128e7bce8da1.tar.xz
wireguard-openbsd-161ad1e2e011031abd77a4206810128e7bce8da1.zip
spacing
-rw-r--r--sbin/dhclient/dhclient.c130
1 files changed, 65 insertions, 65 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 0807a2face6..ae4549dcf92 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.46 2004/05/05 14:29:16 deraadt Exp $ */
+/* $OpenBSD: dhclient.c,v 1.47 2004/05/05 22:21:03 deraadt Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -2118,81 +2118,81 @@ check_option(struct client_lease *l, int option)
l->options[option].len);
switch (option) {
- case DHO_SUBNET_MASK :
- case DHO_TIME_SERVERS :
- case DHO_NAME_SERVERS :
- case DHO_ROUTERS :
- case DHO_DOMAIN_NAME_SERVERS :
- case DHO_LOG_SERVERS :
- case DHO_COOKIE_SERVERS :
- case DHO_LPR_SERVERS :
- case DHO_IMPRESS_SERVERS :
- case DHO_RESOURCE_LOCATION_SERVERS :
- case DHO_SWAP_SERVER :
- case DHO_BROADCAST_ADDRESS :
- case DHO_NIS_SERVERS :
- case DHO_NTP_SERVERS :
- case DHO_NETBIOS_NAME_SERVERS :
- case DHO_NETBIOS_DD_SERVER :
- case DHO_FONT_SERVERS :
- case DHO_DHCP_SERVER_IDENTIFIER :
+ case DHO_SUBNET_MASK:
+ case DHO_TIME_SERVERS:
+ case DHO_NAME_SERVERS:
+ case DHO_ROUTERS:
+ case DHO_DOMAIN_NAME_SERVERS:
+ case DHO_LOG_SERVERS:
+ case DHO_COOKIE_SERVERS:
+ case DHO_LPR_SERVERS:
+ case DHO_IMPRESS_SERVERS:
+ case DHO_RESOURCE_LOCATION_SERVERS:
+ case DHO_SWAP_SERVER:
+ case DHO_BROADCAST_ADDRESS:
+ case DHO_NIS_SERVERS:
+ case DHO_NTP_SERVERS:
+ case DHO_NETBIOS_NAME_SERVERS:
+ case DHO_NETBIOS_DD_SERVER:
+ case DHO_FONT_SERVERS:
+ case DHO_DHCP_SERVER_IDENTIFIER:
if (!ipv4addrs(opbuf)) {
warning("Invalid IP address in option: %s", opbuf);
return (0);
}
return (1) ;
- case DHO_HOST_NAME :
- case DHO_DOMAIN_NAME :
- case DHO_NIS_DOMAIN :
+ case DHO_HOST_NAME:
+ case DHO_DOMAIN_NAME:
+ case DHO_NIS_DOMAIN:
if (!res_hnok(sbuf)) {
warning("Bogus Host Name option %d: %s (%s)", option,
sbuf, opbuf);
return (0);
}
return (1);
- case DHO_PAD :
- case DHO_TIME_OFFSET :
- case DHO_BOOT_SIZE :
- case DHO_MERIT_DUMP :
- case DHO_ROOT_PATH :
- case DHO_EXTENSIONS_PATH :
- case DHO_IP_FORWARDING :
- case DHO_NON_LOCAL_SOURCE_ROUTING :
- case DHO_POLICY_FILTER :
- case DHO_MAX_DGRAM_REASSEMBLY :
- case DHO_DEFAULT_IP_TTL :
- case DHO_PATH_MTU_AGING_TIMEOUT :
- case DHO_PATH_MTU_PLATEAU_TABLE :
- case DHO_INTERFACE_MTU :
- case DHO_ALL_SUBNETS_LOCAL :
- case DHO_PERFORM_MASK_DISCOVERY :
- case DHO_MASK_SUPPLIER :
- case DHO_ROUTER_DISCOVERY :
- case DHO_ROUTER_SOLICITATION_ADDRESS :
- case DHO_STATIC_ROUTES :
- case DHO_TRAILER_ENCAPSULATION :
- case DHO_ARP_CACHE_TIMEOUT :
- case DHO_IEEE802_3_ENCAPSULATION :
- case DHO_DEFAULT_TCP_TTL :
- case DHO_TCP_KEEPALIVE_INTERVAL :
- case DHO_TCP_KEEPALIVE_GARBAGE :
- case DHO_VENDOR_ENCAPSULATED_OPTIONS :
- case DHO_NETBIOS_NODE_TYPE :
- case DHO_NETBIOS_SCOPE :
- case DHO_X_DISPLAY_MANAGER :
- case DHO_DHCP_REQUESTED_ADDRESS :
- case DHO_DHCP_LEASE_TIME :
- case DHO_DHCP_OPTION_OVERLOAD :
- case DHO_DHCP_MESSAGE_TYPE :
- case DHO_DHCP_PARAMETER_REQUEST_LIST :
- case DHO_DHCP_MESSAGE :
- case DHO_DHCP_MAX_MESSAGE_SIZE :
- case DHO_DHCP_RENEWAL_TIME :
- case DHO_DHCP_REBINDING_TIME :
- case DHO_DHCP_CLASS_IDENTIFIER :
- case DHO_DHCP_CLIENT_IDENTIFIER :
- case DHO_DHCP_USER_CLASS_ID :
- case DHO_END :
+ case DHO_PAD:
+ case DHO_TIME_OFFSET:
+ case DHO_BOOT_SIZE:
+ case DHO_MERIT_DUMP:
+ case DHO_ROOT_PATH:
+ case DHO_EXTENSIONS_PATH:
+ case DHO_IP_FORWARDING:
+ case DHO_NON_LOCAL_SOURCE_ROUTING:
+ case DHO_POLICY_FILTER:
+ case DHO_MAX_DGRAM_REASSEMBLY:
+ case DHO_DEFAULT_IP_TTL:
+ case DHO_PATH_MTU_AGING_TIMEOUT:
+ case DHO_PATH_MTU_PLATEAU_TABLE:
+ case DHO_INTERFACE_MTU:
+ case DHO_ALL_SUBNETS_LOCAL:
+ case DHO_PERFORM_MASK_DISCOVERY:
+ case DHO_MASK_SUPPLIER:
+ case DHO_ROUTER_DISCOVERY:
+ case DHO_ROUTER_SOLICITATION_ADDRESS:
+ case DHO_STATIC_ROUTES:
+ case DHO_TRAILER_ENCAPSULATION:
+ case DHO_ARP_CACHE_TIMEOUT:
+ case DHO_IEEE802_3_ENCAPSULATION:
+ case DHO_DEFAULT_TCP_TTL:
+ case DHO_TCP_KEEPALIVE_INTERVAL:
+ case DHO_TCP_KEEPALIVE_GARBAGE:
+ case DHO_VENDOR_ENCAPSULATED_OPTIONS:
+ case DHO_NETBIOS_NODE_TYPE:
+ case DHO_NETBIOS_SCOPE:
+ case DHO_X_DISPLAY_MANAGER:
+ case DHO_DHCP_REQUESTED_ADDRESS:
+ case DHO_DHCP_LEASE_TIME:
+ case DHO_DHCP_OPTION_OVERLOAD:
+ case DHO_DHCP_MESSAGE_TYPE:
+ case DHO_DHCP_PARAMETER_REQUEST_LIST:
+ case DHO_DHCP_MESSAGE:
+ case DHO_DHCP_MAX_MESSAGE_SIZE:
+ case DHO_DHCP_RENEWAL_TIME:
+ case DHO_DHCP_REBINDING_TIME:
+ case DHO_DHCP_CLASS_IDENTIFIER:
+ case DHO_DHCP_CLIENT_IDENTIFIER:
+ case DHO_DHCP_USER_CLASS_ID:
+ case DHO_END:
return (1);
default:
warning("unknown dhcp option value 0x%x", option);