aboutsummaryrefslogtreecommitdiffstats
path: root/net/l2tpd/files
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2003-10-17 04:15:20 +0800
committersobomax <sobomax@FreeBSD.org>2003-10-17 04:15:20 +0800
commitfa91852442747f88ffe004ad1b5d05c3ed2d308a (patch)
tree73ffa9fbb319c683db8ccb968bcb386d4c8f14e9 /net/l2tpd/files
parentd98af036d8b3c7137721aa688723784bd99214ef (diff)
downloadfreebsd-ports-gnome-fa91852442747f88ffe004ad1b5d05c3ed2d308a.tar.gz
freebsd-ports-gnome-fa91852442747f88ffe004ad1b5d05c3ed2d308a.tar.zst
freebsd-ports-gnome-fa91852442747f88ffe004ad1b5d05c3ed2d308a.zip
Unbroke - new gcc now doesn't accept unterminated milti-line strings.
Diffstat (limited to 'net/l2tpd/files')
-rw-r--r--net/l2tpd/files/patch-call.c17
-rw-r--r--net/l2tpd/files/patch-network.c13
2 files changed, 26 insertions, 4 deletions
diff --git a/net/l2tpd/files/patch-call.c b/net/l2tpd/files/patch-call.c
index 45dbdf362963..822b8b0e7f1a 100644
--- a/net/l2tpd/files/patch-call.c
+++ b/net/l2tpd/files/patch-call.c
@@ -1,9 +1,9 @@
$FreeBSD$
---- call.c 2002/10/22 09:41:27 1.1
-+++ call.c 2002/10/22 09:43:13
-@@ -13,9 +13,6 @@
+--- call.c.orig Sat Aug 10 03:47:25 2002
++++ call.c Thu Oct 16 23:13:51 2003
+@@ -14,9 +14,6 @@
#include <stdio.h>
#include <fcntl.h>
@@ -13,3 +13,14 @@ $FreeBSD$
#include <sys/wait.h>
#include <stdlib.h>
#include <string.h>
+@@ -193,8 +190,8 @@
+ }
+ }
+ /* I should never get here */
+- log (LOG_WARN, "%s: You should not see this message. If you do, please
+- enter a bug report at http://sourceforge.net/projects/l2tpd", __FUNCTION__);
++ log (LOG_WARN, "%s: You should not see this message. If you do, please "
++ "enter a bug report at http://sourceforge.net/projects/l2tpd", __FUNCTION__);
+ return -EINVAL;
+ }
+
diff --git a/net/l2tpd/files/patch-network.c b/net/l2tpd/files/patch-network.c
index 5f52352c1fb7..3daa451a56a0 100644
--- a/net/l2tpd/files/patch-network.c
+++ b/net/l2tpd/files/patch-network.c
@@ -2,7 +2,7 @@
$FreeBSD$
--- network.c.orig Wed Apr 10 23:09:33 2002
-+++ network.c Wed Apr 16 16:07:19 2003
++++ network.c Thu Oct 16 23:14:23 2003
@@ -14,9 +14,6 @@
#include <stdio.h>
#include <errno.h>
@@ -30,3 +30,14 @@ $FreeBSD$
server.sin_port = htons (gconfig.port);
if ((server_socket = socket (PF_INET, SOCK_DGRAM, 0)) < 0)
{
+@@ -364,8 +360,8 @@
+ extract (buf->start, &tunnel, &call);
+ if (debug_network)
+ {
+- log (LOG_DEBUG, "%s: recv packet from %s, size = %d,
+-tunnel = %d, call = %d\n", __FUNCTION__, inet_ntoa (from.sin_addr), recvsize, tunnel, call);
++ log (LOG_DEBUG, "%s: recv packet from %s, size = %d, "
++"tunnel = %d, call = %d\n", __FUNCTION__, inet_ntoa (from.sin_addr), recvsize, tunnel, call);
+ }
+ if (packet_dump)
+ {