diff options
| author | Peter Hessler <phessler@cvs.openbsd.org> | 2017-08-21 14:43:34 +0000 |
|---|---|---|
| committer | Peter Hessler <phessler@cvs.openbsd.org> | 2017-08-21 14:43:34 +0000 |
| commit | ae1b27ad0865287bdf72898d587d4d03fddaa6fe (patch) | |
| tree | c7d25576cd18e8f94ad730509f50a5c0397aa152 | |
| parent | 8169ba6704ec5641d9f7b0d9ff01ad9f7377c2d2 (diff) | |
undo unintentional commits
| -rw-r--r-- | usr.sbin/bgpd/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/bgpd/pfkey.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/bgpd/Makefile b/usr.sbin/bgpd/Makefile index 97043aa98bc..a2a5721d7fd 100644 --- a/usr.sbin/bgpd/Makefile +++ b/usr.sbin/bgpd/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.31 2017/08/21 14:41:22 phessler Exp $ +# $OpenBSD: Makefile,v 1.32 2017/08/21 14:43:33 phessler Exp $ PROG= bgpd SRCS= bgpd.c session.c log.c logmsg.c parse.y config.c \ rde.c rde_rib.c rde_decide.c rde_prefix.c mrt.c kroute.c \ control.c pfkey.c rde_update.c rde_attr.c printconf.c \ rde_filter.c pftable.c name2id.c util.c carp.c timer.c -SRCS+= rde_table.c CFLAGS+= -Wall -I${.CURDIR} CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes CFLAGS+= -Wmissing-declarations diff --git a/usr.sbin/bgpd/pfkey.c b/usr.sbin/bgpd/pfkey.c index d37db33719e..0092358fb30 100644 --- a/usr.sbin/bgpd/pfkey.c +++ b/usr.sbin/bgpd/pfkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkey.c,v 1.50 2017/08/21 14:41:22 phessler Exp $ */ +/* $OpenBSD: pfkey.c,v 1.51 2017/08/21 14:43:33 phessler Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -524,6 +524,8 @@ pfkey_sa_remove(struct bgpd_addr *src, struct bgpd_addr *dst, u_int32_t *spi) int pfkey_md5sig_establish(struct peer *p) { + sleep(1); + if (!p->auth.spi_out) if (pfkey_sa_add(&p->auth.local_addr, &p->conf.remote_addr, p->conf.auth.md5key_len, p->conf.auth.md5key, |