summaryrefslogtreecommitdiff
path: root/net/pptpclient/files/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'net/pptpclient/files/patch-ab')
-rw-r--r--net/pptpclient/files/patch-ab43
1 files changed, 35 insertions, 8 deletions
diff --git a/net/pptpclient/files/patch-ab b/net/pptpclient/files/patch-ab
index 5b024aa90ef0..06fa6345189f 100644
--- a/net/pptpclient/files/patch-ab
+++ b/net/pptpclient/files/patch-ab
@@ -1,18 +1,45 @@
-RCS file: /home/jdp/f5/pptp/cvs/pptp/pptp.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.3
-diff -u -r1.1.1.1 -r1.3
---- pptp.c 1999/04/28 19:36:57 1.1.1.1
-+++ pptp.c 1999/04/29 17:05:59 1.3
-@@ -18,6 +18,7 @@
+diff -ur dist/pptp-linux-1.0.3/pptp.c work/pptp-linux-1.0.3/pptp.c
+--- dist/pptp-linux-1.0.3/pptp.c Mon Apr 30 05:42:36 2001
++++ pptp.c Thu May 10 00:43:02 2001
+@@ -7,7 +7,11 @@
+
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#ifdef __FreeBSD__
++#include <libutil.h>
++#else
+ #include <pty.h>
++#endif
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <sys/un.h>
+@@ -19,14 +23,15 @@
#include <signal.h>
#include <setjmp.h>
#include <errno.h>
+#include <fcntl.h>
#include <sys/wait.h>
++#include <limits.h>
+ #include <getopt.h>
#include "pptp_callmgr.h"
#include "pptp_gre.h"
-@@ -235,13 +236,23 @@
+ #include "version.h"
+ #include "inststr.h"
+ #include "util.h"
+-#include "pty.h"
+
+ #ifndef PPPD_BINARY
+ #define PPPD_BINARY "pppd"
+@@ -64,7 +69,7 @@
+ int main(int argc, char **argv, char **envp) {
+ struct in_addr inetaddr;
+ int callmgr_sock;
+- char ttydev[TTYMAX];
++ char ttydev[PATH_MAX];
+ int pty_fd, tty_fd, rc;
+ pid_t parent_pid, child_pid;
+ u_int16_t call_id, peer_call_id;
+@@ -289,13 +294,23 @@
void launch_pppd(char *ttydev, int argc, char **argv) {
char *new_argv[argc+4]; /* XXX if not using GCC, hard code a limit here. */
int i;