disable pipex for L2TP on disconnect, too; yasuoka@ agrees.

1 files changed, 11 insertions, 2 deletions

diff --git a/usr.sbin/npppd/npppd/npppd.c b/usr.sbin/npppd/npppd/npppd.c
index 87d874a24e7..edb6266b0b2 100644
--- a/usr.sbin/npppd/npppd/npppd.c
+++ b/usr.sbin/npppd/npppd/npppd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: npppd.c,v 1.9 2011/04/02 12:04:44 dlg Exp $ */
+/* $OpenBSD: npppd.c,v 1.10 2011/05/15 15:47:52 markus Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -29,7 +29,7 @@
  * Next pppd(nppd). This file provides a npppd daemon process and operations
  * for npppd instance.
  * @author	Yasuoka Masahiko
- * $Id: npppd.c,v 1.9 2011/04/02 12:04:44 dlg Exp $
+ * $Id: npppd.c,v 1.10 2011/05/15 15:47:52 markus Exp $
  */
 #include <sys/cdefs.h>
 #include "version.h"
@@ -1145,6 +1145,15 @@ npppd_ppp_pipex_disable(npppd *_this, npppd_ppp *ppp)
 		req.pcr_protocol = PIPEX_PROTO_PPTP;
 		break;
 #endif
+#ifdef USE_NPPPD_L2TP
+	case PPP_TUNNEL_L2TP:
+		l2tp = (l2tp_call *)ppp->phy_context;
+
+		/* L2TP specific context */
+		req.pcr_session_id = l2tp->session_id;
+		req.pcr_protocol = PIPEX_PROTO_L2TP;
+		break;
+#endif
 	default:
 		return 1;
 	}