diff options
| author |   yasuoka <yasuoka@openbsd.org> | 2013-04-20 07:00:19 +0000 |
|---|---|---|
| committer | yasuoka <yasuoka@openbsd.org> | 2013-04-20 07:00:19 +0000 |
| commit | 06adecbe9d2ecee523de9943a053bacee329a947 (patch) | |
| tree | 05a166ddbaeb0d137694bd5f7e99e24fb08dfc07 /usr.sbin/npppd/l2tp | |
| parent | adjust comment (diff) | |
| download | wireguard-openbsd-06adecbe9d2ecee523de9943a053bacee329a947.tar.xz wireguard-openbsd-06adecbe9d2ecee523de9943a053bacee329a947.zip | |
PPPoE server was broken since last configuration rework. Calling
pppoed_init() was accidentally deleted. Revert it in npppd_init() and
rearrange l2tpd_init() and pptpd_init() to the same place.
ok todd
Diffstat (limited to 'usr.sbin/npppd/l2tp')
| -rw-r--r-- | usr.sbin/npppd/l2tp/l2tpd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/npppd/l2tp/l2tpd.c b/usr.sbin/npppd/l2tp/l2tpd.c index 9a599fb0fe8..7f752226154 100644 --- a/usr.sbin/npppd/l2tp/l2tpd.c +++ b/usr.sbin/npppd/l2tp/l2tpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: l2tpd.c,v 1.11 2012/09/18 13:14:08 yasuoka Exp $ */ +/* $OpenBSD: l2tpd.c,v 1.12 2013/04/20 07:00:19 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /**@file L2TP(Layer Two Tunneling Protocol "L2TP") / RFC2661 */ -/* $Id: l2tpd.c,v 1.11 2012/09/18 13:14:08 yasuoka Exp $ */ +/* $Id: l2tpd.c,v 1.12 2013/04/20 07:00:19 yasuoka Exp $ */ #include <sys/types.h> #include <sys/socket.h> #include <sys/time.h> @@ -573,8 +573,6 @@ l2tpd_reload(l2tpd *_this, struct l2tp_confs *l2tp_conf) return 0; } - if (l2tpd_init(_this) != 0) - return -1; i = 0; TAILQ_FOREACH(conf, l2tp_conf, entry) l2tpd_add_listener(_this, i++, conf); |