svn commit: r366684 - in head/net/poptop: . files

[John Marino]

Author: marino
Date: Sat Aug 30 21:49:21 2014
New Revision: 366684
URL: http://svnweb.freebsd.org/changeset/ports/366684
QAT: https://qat.redports.org/buildarchive/r366684/

Log:
  net/poptop: Fix KERNPPP option operation
  
  PR:		186172
  Reported by:	timp87 (gmail)
  Solution by:	blackscreen (gmail)

Modified:
  head/net/poptop/Makefile
  head/net/poptop/files/patch-pptpctrl.c

Modified: head/net/poptop/Makefile
==============================================================================
--- head/net/poptop/Makefile	Sat Aug 30 21:32:04 2014	(r366683)
+++ head/net/poptop/Makefile	Sat Aug 30 21:49:21 2014	(r366684)
@@ -3,6 +3,7 @@
 
 PORTNAME=	poptop
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/pptpd/pptpd-${PORTVERSION} \
 		SAMBA/ppp:pppd

Modified: head/net/poptop/files/patch-pptpctrl.c
==============================================================================
--- head/net/poptop/files/patch-pptpctrl.c	Sat Aug 30 21:32:04 2014	(r366683)
+++ head/net/poptop/files/patch-pptpctrl.c	Sat Aug 30 21:49:21 2014	(r366684)
@@ -38,7 +38,7 @@
  
  #elif SLIRP
  
-@@ -786,7 +796,7 @@
+@@ -786,14 +796,14 @@
  
          if (pptp_logwtmp) {
                   pppd_argv[an++] = "plugin";
@@ -47,3 +47,11 @@
                   pppd_argv[an++] = "pptpd-original-ip";
                   pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
          }
+-#endif
+
+         pppd_argv[an++] = "remotenumber";
+         pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
++#endif
+
+         /* argv arrays must always be NULL terminated */
+         pppd_argv[an++] = NULL;