1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
--- pptpctrl.c.orig Fri Dec 8 01:01:40 2006
+++ pptpctrl.c Tue Jul 31 07:56:19 2007
@@ -163,8 +163,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);
@@ -708,14 +713,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
@@ -786,14 +796,14 @@
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
pppd_argv[an++] = "remotenumber";
pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
+#endif
/* argv arrays must always be NULL terminated */
pppd_argv[an++] = NULL;
|
