src/patches/pptp-1.7.2-compat.patch

   1 Index: pptp_compat.c
   2 ===================================================================
   3 RCS file: /cvsroot/pptpclient/pptp-linux/pptp_compat.c,v
   4 retrieving revision 1.1
   5 retrieving revision 1.3
   6 diff -u -r1.1 -r1.3
   7 --- pptp_compat.c       19 Feb 2008 21:43:28 -0000      1.1
   8 +++ pptp_compat.c       25 Jul 2008 00:13:56 -0000      1.3
   9 @@ -7,14 +7,15 @@
  10  #include <fcntl.h>
  11  #include <sys/types.h>
  12  #include <unistd.h>
  13 -#include <stropts.h>
  14  #include <stdlib.h>
  15 +#if defined (__SVR4) && defined (__sun) /* Solaris */
  16 +#include <stropts.h>
  17 +#endif
  18  #include <strings.h>
  19  #include "pptp_compat.h"
  20  #include <stdio.h>
  21  #include "util.h"
  22
  23 -
  24  #if defined (__SVR4) && defined (__sun) /* Solaris */
  25  /*
  26   * daemon implementation from uClibc
  27 Index: pptp.c
  28 ===================================================================
  29 RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v
  30 retrieving revision 1.49
  31 retrieving revision 1.51
  32 diff -u -r1.49 -r1.51
  33 --- pptp.c      14 May 2008 06:32:52 -0000      1.49
  34 +++ pptp.c      24 Jul 2008 05:53:05 -0000      1.51
  35 @@ -61,9 +61,8 @@
  36  #include "version.h"
  37  #if defined(__linux__)
  38  #include <sys/prctl.h>
  39 -#else
  40 -#include "inststr.h"
  41  #endif
  42 +#include "inststr.h"
  43  #include "util.h"
  44  #include "pptp_quirks.h"
  45  #include "pqueue.h"
  46 @@ -129,7 +128,7 @@
  47  }
  48
  49  #if defined (__SVR4) && defined (__sun)
  50 -struct in_addr localbind = { INADDR_ANY };
  51 +struct in_addr localbind = { .s_addr = INADDR_ANY };
  52  #else
  53  struct in_addr localbind = { INADDR_NONE };
  54  #endif
  55 @@ -183,6 +182,7 @@
  56      struct in_addr inetaddr;
  57      volatile int callmgr_sock = -1;
  58      char ttydev[PATH_MAX];
  59 +    char *tty_name;
  60      int pty_fd, tty_fd, gre_fd, rc;
  61      volatile pid_t parent_pid, child_pid;
  62      u_int16_t call_id, peer_call_id;
  63 @@ -391,7 +391,7 @@
  64          file2fd("/dev/null", "wb", STDERR_FILENO);
  65      }
  66
  67 -    char *tty_name = ttyname(tty_fd);
  68 +    tty_name = ttyname(tty_fd);
  69      snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s",
  70                tty_name ? tty_name : "(null)");
  71  #ifdef PR_SET_NAME