]>
Commit | Line | Data |
---|---|---|
e4270eee JR |
1 | --- dip-3.3.7o/skey/skeysubr.c.glibc Thu Jul 17 16:00:39 1997 |
2 | +++ dip-3.3.7o/skey/skeysubr.c Thu Jul 17 16:00:39 1997 | |
3 | @@ -42,6 +42,7 @@ | |
4 | # define gtty(fd,buf) ioctl((fd),TIOCGETP,(buf)) | |
5 | #else | |
6 | # include <termio.h> | |
7 | +# include <sys/ioctl.h> | |
8 | # define TTYSTRUCT termio | |
9 | # define stty(fd,buf) ioctl((fd),TCSETA,(buf)) | |
10 | # define gtty(fd,buf) ioctl((fd),TCGETA,(buf)) | |
11 | --- dip-3.3.7o/skey/Makefile.glibc Mon Jul 24 20:22:49 1995 | |
12 | +++ dip-3.3.7o/skey/Makefile Thu Jul 17 16:03:17 1997 | |
13 | @@ -12,7 +12,7 @@ | |
14 | CC = gcc | |
15 | CFLAGS = -pipe -O2 #-DUSE_ECHO | |
16 | #SYSLIBS = -lshadow -ldbm | |
17 | -SYSLIBS = -ldbm # For ELF - no shadow needed (included in libc). | |
18 | +SYSLIBS = -ldb -lcrypt # For ELF - no shadow needed (included in libc). | |
19 | ||
20 | LIB = libskey.a | |
21 | PROGS = key keyinit keysh | |
22 | --- dip-3.3.7o/skey/skeyinit.c.glibc Thu Jul 17 16:00:39 1997 | |
23 | +++ dip-3.3.7o/skey/skeyinit.c Thu Jul 17 16:00:39 1997 | |
24 | @@ -13,10 +13,7 @@ | |
25 | #include <string.h> | |
26 | #include <pwd.h> | |
27 | #ifdef linux | |
28 | -# ifndef __alpha__ | |
29 | -# undef SHADOW | |
30 | # include <shadow.h> | |
31 | -# endif | |
32 | #endif | |
33 | #include <sys/resource.h> | |
34 | #include <time.h> | |
35 | --- dip-3.3.7o/skey/md4.c.glibc Thu Jul 17 16:02:37 1997 | |
36 | +++ dip-3.3.7o/skey/md4.c Thu Jul 17 16:02:47 1997 | |
37 | @@ -7,6 +7,8 @@ | |
38 | */ | |
39 | #include <sys/types.h> | |
40 | ||
41 | +typedef unsigned int __u32; | |
42 | + | |
43 | /* | |
44 | * To use MD4: | |
45 | * -- Include md4.h in your program | |
46 | --- dip-3.3.7o/skey/put.c.glibc Thu Jul 17 16:02:58 1997 | |
47 | +++ dip-3.3.7o/skey/put.c Thu Jul 17 16:03:05 1997 | |
48 | @@ -16,6 +16,8 @@ | |
49 | #include <sys/types.h> | |
50 | #include "skey.h" | |
51 | ||
52 | +typedef unsigned int __u32; | |
53 | + | |
54 | static __u32 extract __ARGS ((char *s, int start, int length)); | |
55 | static void standard __ARGS ((char *word)); | |
56 | static void insert __ARGS ((char *s, int x, int start, int length)); | |
57 | --- dip-3.3.7o/dip.h.glibc Thu Jul 17 16:00:39 1997 | |
58 | +++ dip-3.3.7o/dip.h Thu Jul 17 16:00:39 1997 | |
59 | @@ -40,9 +40,10 @@ | |
60 | #include <sys/socket.h> | |
61 | #include <sys/ioctl.h> | |
62 | #include <sys/time.h> | |
63 | +#include <netinet/in.h> | |
64 | +#include <netinet/ip.h> | |
65 | #include <arpa/inet.h> | |
66 | #include <arpa/nameser.h> | |
67 | -#include <netinet/in.h> | |
68 | #include <net/if_arp.h> | |
69 | #include <netdb.h> | |
70 | #include <resolv.h> | |
71 | --- dip-3.3.7o/command.c.glibc Thu Jul 17 16:00:39 1997 | |
72 | +++ dip-3.3.7o/command.c Thu Jul 17 16:06:32 1997 | |
73 | @@ -29,11 +29,13 @@ | |
74 | * your option) any later version. | |
75 | */ | |
76 | #include "dip.h" | |
77 | -#include <linux/types.h> | |
78 | -#include <linux/ip.h> | |
79 | -#include <linux/udp.h> | |
80 | +#include <netinet/ip.h> | |
81 | +#include <netinet/udp.h> | |
82 | #include <sys/wait.h> | |
83 | ||
84 | +typedef unsigned int __u32; | |
85 | +typedef unsigned short __u16; | |
86 | + | |
87 | #define HASHSIZE 128 | |
88 | ||
89 | struct variable { | |
90 | @@ -680,7 +682,7 @@ | |
91 | nargv = malloc (argc*sizeof(char*)); /* allocate the array of pointers */ | |
92 | if (nargv == NULL) /* Ooops? */ | |
93 | { | |
94 | - fprintf (stderr, "error: Couldn't allocate %d bytes for" /* Ooops! */ | |
95 | + fprintf (stderr, "error: Couldn't allocate %ld bytes for" /* Ooops! */ | |
96 | " onexit commands array: `%s'\n", | |
97 | argc*sizeof(char*), strerror (errno) ); | |
98 | return -1; | |
99 | @@ -694,7 +696,7 @@ | |
100 | nargv[cnt] = malloc (strlen(argv[cnt]) + 1); /* allocate */ | |
101 | if (nargv[cnt] == NULL) /* Oops? */ | |
102 | { | |
103 | - fprintf (stderr, "error: Couldn't allocate %d bytes for argument %d" | |
104 | + fprintf (stderr, "error: Couldn't allocate %ld bytes for argument %d" | |
105 | " of the onexit command: `%s'\n", | |
106 | strlen (argv[cnt]), cnt, strerror (errno) ); | |
107 | arg_clean (argc, nargv); /* clean */ | |
108 | --- dip-3.3.7o/tty.c.glibc Thu Jul 17 16:03:48 1997 | |
109 | +++ dip-3.3.7o/tty.c Thu Jul 17 16:03:56 1997 | |
110 | @@ -29,8 +29,6 @@ | |
111 | #include "dip.h" | |
112 | #include <sys/stat.h> | |
113 | #ifdef LINUX | |
114 | -# include <linux/fs.h> | |
115 | -# include <linux/tty.h> | |
116 | #ifndef NO_SERIAL | |
117 | # include <linux/serial.h> /* for Linux-1.1.13 */ | |
118 | #endif /* ~NO_SERIAL */ | |
119 | --- dip-3.3.7o/attach.c.glibc Thu Jul 17 16:04:32 1997 | |
120 | +++ dip-3.3.7o/attach.c Thu Jul 17 16:05:12 1997 | |
121 | @@ -130,10 +130,12 @@ | |
122 | ||
123 | #include <sys/socket.h> | |
124 | #include <net/if.h> | |
125 | -#include <linux/route.h> | |
126 | -#include <linux/if_ether.h> | |
127 | +#include <net/route.h> | |
128 | +#include <netinet/if_ether.h> | |
129 | #include <netinet/in.h> | |
130 | #include <time.h> | |
131 | + | |
132 | +typedef unsigned int __u32; | |
133 | ||
134 | #define MAX_IFS 512 | |
135 |