summaryrefslogtreecommitdiffstats
path: root/usr.sbin/dhcrelay
diff options
context:
space:
mode:
authorrzalamena <rzalamena@openbsd.org>2016-12-13 17:40:41 +0000
committerrzalamena <rzalamena@openbsd.org>2016-12-13 17:40:41 +0000
commit699fe6719715e2c966f17f350a5a35762fb97e1b (patch)
tree223156e93b6902b930c2b2993e85a034006d950f /usr.sbin/dhcrelay
parentsync (diff)
downloadwireguard-openbsd-699fe6719715e2c966f17f350a5a35762fb97e1b.tar.xz
wireguard-openbsd-699fe6719715e2c966f17f350a5a35762fb97e1b.zip
Unbreak the dhcrelay(8) support to run on enc(4) interfaces.
ok reyk@
Diffstat (limited to 'usr.sbin/dhcrelay')
-rw-r--r--usr.sbin/dhcrelay/dhcrelay.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/dhcrelay/dhcrelay.c b/usr.sbin/dhcrelay/dhcrelay.c
index 34c3e13f04a..edf372b97e7 100644
--- a/usr.sbin/dhcrelay/dhcrelay.c
+++ b/usr.sbin/dhcrelay/dhcrelay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhcrelay.c,v 1.53 2016/12/13 15:28:19 rzalamena Exp $ */
+/* $OpenBSD: dhcrelay.c,v 1.54 2016/12/13 17:40:41 rzalamena Exp $ */
/*
* Copyright (c) 2004 Henning Brauer <henning@cvs.openbsd.org>
@@ -224,7 +224,8 @@ main(int argc, char *argv[])
error("no interface given");
/* We need an address for running layer 3 mode. */
if (drm == DRM_LAYER3 &&
- interfaces->primary_address.s_addr == 0)
+ (interfaces->hw_address.htype != HTYPE_IPSEC_TUNNEL &&
+ interfaces->primary_address.s_addr == 0))
error("interface '%s' does not have an address",
interfaces->name);