diff options
| author |   giovanni <giovanni@openbsd.org> | 2013-04-06 17:03:51 +0000 |
|---|---|---|
| committer | giovanni <giovanni@openbsd.org> | 2013-04-06 17:03:51 +0000 |
| commit | c38b0221bc9e02a312f4470eccedadf9d2d17064 (patch) | |
| tree | a9a8700a6d463a653fef582b3d085d8c876c1a72 | |
| parent | Remove duplicate "is supported" text and reformat. (diff) | |
| download | wireguard-openbsd-c38b0221bc9e02a312f4470eccedadf9d2d17064.tar.xz wireguard-openbsd-c38b0221bc9e02a312f4470eccedadf9d2d17064.zip | |
Turn an error into a warning to be able to start l2tp tunnels even if
gre is not allowed.
ok yasuoka@
| -rw-r--r-- | usr.sbin/npppd/pptp/pptpd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/npppd/pptp/pptpd.c b/usr.sbin/npppd/pptp/pptpd.c index 60cd27c6ff6..086a368a4e0 100644 --- a/usr.sbin/npppd/pptp/pptpd.c +++ b/usr.sbin/npppd/pptp/pptpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pptpd.c,v 1.15 2013/03/14 10:21:07 mpi Exp $ */ +/* $OpenBSD: pptpd.c,v 1.16 2013/04/06 17:03:51 giovanni Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -25,12 +25,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $Id: pptpd.c,v 1.15 2013/03/14 10:21:07 mpi Exp $ */ +/* $Id: pptpd.c,v 1.16 2013/04/06 17:03:51 giovanni Exp $ */ /**@file * This file provides a implementation of PPTP daemon. Currently it * provides functions for PAC (PPTP Access Concentrator) only. - * $Id: pptpd.c,v 1.15 2013/03/14 10:21:07 mpi Exp $ + * $Id: pptpd.c,v 1.16 2013/04/06 17:03:51 giovanni Exp $ */ #include <sys/types.h> #include <sys/param.h> @@ -108,8 +108,7 @@ pptpd_init(pptpd *_this) if (sysctl(mib, sizeof(mib)/sizeof(mib[0]), &value, &size, NULL, 0) == 0) { if(value == 0) { - pptpd_log(_this, LOG_ERR, "GRE protocol not allowed"); - return 1; + pptpd_log(_this, LOG_WARNING, "GRE protocol not allowed"); } } |