mirror of
https://git.freebsd.org/ports.git
synced 2025-06-24 22:20:35 -04:00
918926d6c1
Thanks to Harold Gold for making the patch and Brett Glass (brett on lariat.net) for bringing it to maintainer's attention - Bump PORTREVISION PR: 115073 Submitted by: Nils Vogels <nivo+kw+ports.bfa274@is-root.com> (maintainer)
62 lines
1.8 KiB
C
62 lines
1.8 KiB
C
--- pptpctrl.c.orig Fri Dec 8 01:01:40 2006
|
|
+++ pptpctrl.c Tue Jul 31 07:56:19 2007
|
|
@@ -150,8 +150,13 @@
|
|
syslog(LOG_DEBUG, "CTRL: remote address = %s", pppRemote);
|
|
if (*speed)
|
|
syslog(LOG_DEBUG, "CTRL: pppd speed = %s", speed);
|
|
+#if BSDUSER_PPP
|
|
+ if (*pppdxfig)
|
|
+ syslog(LOG_DEBUG, "CTRL: BSD userland ppp system label = %s", pppdxfig);
|
|
+#else
|
|
if (*pppdxfig)
|
|
syslog(LOG_DEBUG, "CTRL: pppd options file = %s", pppdxfig);
|
|
+#endif
|
|
}
|
|
|
|
addrlen = sizeof(addr);
|
|
@@ -693,14 +698,19 @@
|
|
|
|
/* options for BSDUSER_PPP
|
|
*
|
|
- * ignores IP addresses, config file option, speed
|
|
- * fix usage info in pptpd.c and configure script if this changes
|
|
+ * Ignore IP addresses and line speed
|
|
+ * Use -o or --option string as PPP system label
|
|
+ * Usage info in pptpd.c and configure script have been updated to
|
|
+ * reflect this change
|
|
*
|
|
* IP addresses can be specified in /etc/ppp/ppp.secret per user
|
|
*/
|
|
pppd_argv[an++] = "-direct";
|
|
- pppd_argv[an++] = "pptp"; /* XXX this is the system name */
|
|
- /* should be dynamic - PMG */
|
|
+ if (*pppdxfig) {
|
|
+ pppd_argv[an++] = pppdxfig;
|
|
+ } else {
|
|
+ pppd_argv[an++] = "pptp"; /* XXX this is the system label */
|
|
+ }
|
|
|
|
#elif SLIRP
|
|
|
|
@@ -764,7 +774,6 @@
|
|
sprintf(pppInterfaceIPs, "%s:%s", pppaddrs[0], pppaddrs[1]);
|
|
pppd_argv[an++] = pppInterfaceIPs;
|
|
}
|
|
-#endif
|
|
|
|
if (!noipparam) {
|
|
pppd_argv[an++] = "ipparam";
|
|
@@ -773,10 +782,12 @@
|
|
|
|
if (pptp_logwtmp) {
|
|
pppd_argv[an++] = "plugin";
|
|
- pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
|
|
+ pppd_argv[an++] = "%%PREFIX%%/lib/pptpd/pptpd-logwtmp.so";
|
|
pppd_argv[an++] = "pptpd-original-ip";
|
|
pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
|
|
}
|
|
+
|
|
+#endif
|
|
|
|
/* argv arrays must always be NULL terminated */
|
|
pppd_argv[an++] = NULL;
|