|
 |
27639a |
Index: pptp_compat.c
|
|
|
27639a |
===================================================================
|
|
|
27639a |
RCS file: /cvsroot/pptpclient/pptp-linux/pptp_compat.c,v
|
|
|
27639a |
retrieving revision 1.1
|
|
|
27639a |
retrieving revision 1.3
|
|
|
27639a |
diff -u -r1.1 -r1.3
|
|
|
27639a |
--- pptp_compat.c 19 Feb 2008 21:43:28 -0000 1.1
|
|
|
27639a |
+++ pptp_compat.c 25 Jul 2008 00:13:56 -0000 1.3
|
|
|
27639a |
@@ -7,14 +7,15 @@
|
|
|
27639a |
#include <fcntl.h>
|
|
|
27639a |
#include <sys/types.h>
|
|
|
27639a |
#include <unistd.h>
|
|
|
27639a |
-#include <stropts.h>
|
|
|
27639a |
#include <stdlib.h>
|
|
|
27639a |
+#if defined (__SVR4) && defined (__sun) /* Solaris */
|
|
|
27639a |
+#include <stropts.h>
|
|
|
27639a |
+#endif
|
|
|
27639a |
#include <strings.h>
|
|
|
27639a |
#include "pptp_compat.h"
|
|
|
27639a |
#include <stdio.h>
|
|
|
27639a |
#include "util.h"
|
|
|
27639a |
|
|
|
27639a |
-
|
|
|
27639a |
#if defined (__SVR4) && defined (__sun) /* Solaris */
|
|
|
27639a |
/*
|
|
|
27639a |
* daemon implementation from uClibc
|
|
|
27639a |
Index: pptp.c
|
|
|
27639a |
===================================================================
|
|
|
27639a |
RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v
|
|
|
27639a |
retrieving revision 1.49
|
|
|
27639a |
retrieving revision 1.51
|
|
|
27639a |
diff -u -r1.49 -r1.51
|
|
|
27639a |
--- pptp.c 14 May 2008 06:32:52 -0000 1.49
|
|
|
27639a |
+++ pptp.c 24 Jul 2008 05:53:05 -0000 1.51
|
|
|
27639a |
@@ -61,9 +61,8 @@
|
|
|
27639a |
#include "version.h"
|
|
|
27639a |
#if defined(__linux__)
|
|
|
27639a |
#include <sys/prctl.h>
|
|
|
27639a |
-#else
|
|
|
27639a |
-#include "inststr.h"
|
|
|
27639a |
#endif
|
|
|
27639a |
+#include "inststr.h"
|
|
|
27639a |
#include "util.h"
|
|
|
27639a |
#include "pptp_quirks.h"
|
|
|
27639a |
#include "pqueue.h"
|
|
|
27639a |
@@ -129,7 +128,7 @@
|
|
|
27639a |
}
|
|
|
27639a |
|
|
|
27639a |
#if defined (__SVR4) && defined (__sun)
|
|
|
27639a |
-struct in_addr localbind = { INADDR_ANY };
|
|
|
27639a |
+struct in_addr localbind = { .s_addr = INADDR_ANY };
|
|
|
27639a |
#else
|
|
|
27639a |
struct in_addr localbind = { INADDR_NONE };
|
|
|
27639a |
#endif
|
|
|
27639a |
@@ -183,6 +182,7 @@
|
|
|
27639a |
struct in_addr inetaddr;
|
|
|
27639a |
volatile int callmgr_sock = -1;
|
|
|
27639a |
char ttydev[PATH_MAX];
|
|
|
27639a |
+ char *tty_name;
|
|
|
27639a |
int pty_fd, tty_fd, gre_fd, rc;
|
|
|
27639a |
volatile pid_t parent_pid, child_pid;
|
|
|
27639a |
u_int16_t call_id, peer_call_id;
|
|
|
27639a |
@@ -391,7 +391,7 @@
|
|
|
27639a |
file2fd("/dev/null", "wb", STDERR_FILENO);
|
|
|
27639a |
}
|
|
|
27639a |
|
|
|
27639a |
- char *tty_name = ttyname(tty_fd);
|
|
|
27639a |
+ tty_name = ttyname(tty_fd);
|
|
|
27639a |
snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s",
|
|
|
27639a |
tty_name ? tty_name : "(null)");
|
|
|
27639a |
#ifdef PR_SET_NAME
|