summaryrefslogtreecommitdiff
path: root/usr.sbin/bgpd
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-03-31 10:26:35 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-03-31 10:26:35 +0000
commit48d456062bd61e295f5b398b91c8552d32b13e7d (patch)
tree57ab6f4b506067b271cb82ebdd331824b8abd6b6 /usr.sbin/bgpd
parentb1b86ff21f87d93765f57f3538d4b30fc64c2595 (diff)
it is no longer required to have local-address set with tcp md5sig,
so remove the check.
Diffstat (limited to 'usr.sbin/bgpd')
-rw-r--r--usr.sbin/bgpd/config.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/usr.sbin/bgpd/config.c b/usr.sbin/bgpd/config.c
index 4a2c231642a..7547f456b0a 100644
--- a/usr.sbin/bgpd/config.c
+++ b/usr.sbin/bgpd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.33 2004/03/17 17:49:53 henning Exp $ */
+/* $OpenBSD: config.c,v 1.34 2004/03/31 10:26:34 henning Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -66,11 +66,6 @@ merge_config(struct bgpd_config *xconf, struct bgpd_config *conf,
if (p->conf.enforce_as == ENFORCE_AS_UNDEF)
p->conf.enforce_as = p->conf.ebgp == 0 ?
ENFORCE_AS_OFF : ENFORCE_AS_ON;
- if (p->conf.tcp_md5_key[0] && p->conf.local_addr.af == 0) {
- log_peer_warnx(&p->conf, "\"tcp md5sig\" requires "
- "\"local-address\" to be set");
- errs++;
- }
}
memcpy(xconf, conf, sizeof(struct bgpd_config));