summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorBill Fenner <fenner@FreeBSD.org>1997-05-22 05:13:53 +0000
committerBill Fenner <fenner@FreeBSD.org>1997-05-22 05:13:53 +0000
commit51969ec84cbd5fe8a283915cb6c73cab0b846008 (patch)
tree1158d8e41d5196ac7a450e8887aade43a9df9589 /net
parentFix problem related to a forth coming CERT advisory wrt quoting of (diff)
Make sdr build under 3.0
Notes
Notes: svn path=/head/; revision=6531
Diffstat (limited to 'net')
-rw-r--r--net/sdr/files/patch-ac67
1 files changed, 40 insertions, 27 deletions
diff --git a/net/sdr/files/patch-ac b/net/sdr/files/patch-ac
index d7a08664be82..3d7ce87d7271 100644
--- a/net/sdr/files/patch-ac
+++ b/net/sdr/files/patch-ac
@@ -1,27 +1,40 @@
-Index: src/sdr.h
-===================================================================
-RCS file: /tilde/fenner/conf/sdr/cvs/sdr/src/sdr.h,v
-retrieving revision 1.7
-diff -c -r1.7 sdr.h
-*** 1.7 1996/11/12 17:33:22
---- sdr.h 1996/11/12 17:39:10
-***************
-*** 147,156 ****
---- 147,163 ----
- };
-
- struct sap_header {
-+ #if BYTE_ORDER == BIG_ENDIAN
- u_int version:3;
- u_int type:3;
- u_int enc:1;
- u_int compress:1;
-+ #else
-+ u_int compress:1;
-+ u_int enc:1;
-+ u_int type:3;
-+ u_int version:3;
-+ #endif
- u_int authlen:8;
- u_int msgid:16;
- u_int src;
+--- src/sdr.h.orig Wed May 21 22:06:02 1997
++++ src/sdr.h Wed May 21 22:10:05 1997
+@@ -8,9 +8,6 @@
+ #include <winsock.h>
+ #else
+ #include <sys/socket.h>
+-#include <netinet/in.h>
+-#include <arpa/inet.h>
+-#include <net/if.h>
+ #include <sys/ioctl.h>
+ #include <netdb.h>
+ #include <pwd.h>
+@@ -18,6 +15,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
++#include <netinet/in.h>
++#include <net/if.h>
++#include <arpa/inet.h>
+ #include <arpa/nameser.h>
+ #include <resolv.h>
+ #ifdef AIX41
+@@ -146,10 +146,17 @@
+ };
+
+ struct sap_header {
++#if BYTE_ORDER == BIG_ENDIAN
+ u_int version:3;
+ u_int type:3;
+ u_int enc:1;
+ u_int compress:1;
++#else
++ u_int compress:1;
++ u_int enc:1;
++ u_int type:3;
++ u_int version:3;
++#endif
+ u_int authlen:8;
+ u_int msgid:16;
+ u_int src;