Attachment #559790 for bug #647210

View | Details | Raw Unified | Return to bug 647210
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-49 / +48 lines)
0	-- a/options.c	0	++ b/options.c
Lines 34-39 Link Here
34		34
35	/* System libraries. */	35	/* System libraries. */
36		36
		37	#include <unistd.h>
		38	#include <stdlib.h>
37	#include <sys/types.h>	39	#include <sys/types.h>
38	#include <sys/param.h>	40	#include <sys/param.h>
39	#include <sys/socket.h>	41	#include <sys/socket.h>
40	-- a/safe_finger.c	42	++ b/safe_finger.c
Lines 20-25 Link Here
20		20
21	/* System libraries */	21	/* System libraries */
22		22
		23	#include <unistd.h>
		24	#include <fcntl.h>
		25	#include <stdlib.h>
		26	#include <sys/wait.h>
		27	#include <grp.h>
23	#include <sys/types.h>	28	#include <sys/types.h>
24	#include <sys/stat.h>	29	#include <sys/stat.h>
25	#include <signal.h>	30	#include <signal.h>
Lines 27-33 Link Here
27	#include <ctype.h>	31	#include <ctype.h>
28	#include <pwd.h>	32	#include <pwd.h>
29		33
30	extern void exit();	34	int pipe_stdin(char **argv);
31		35
32	/* Local stuff */	36	/* Local stuff */
33		37
34	-- a/scaffold.c	38	++ b/scaffold.c
Lines 10-15 Link Here
10		10
11	/* System libraries. */	11	/* System libraries. */
12		12
		13	#include <stdlib.h>
13	#include <sys/types.h>	14	#include <sys/types.h>
14	#include <sys/stat.h>	15	#include <sys/stat.h>
15	#include <sys/socket.h>	16	#include <sys/socket.h>
Lines 27-33 Link Here
27	#endif	27	#endif
28		28
29	#ifndef INET6
30	extern char *malloc();
31	#endif
32		29
33	/* Application-specific. */	30	/* Application-specific. */
34	-- a/shell_cmd.c	31	++ b/shell_cmd.c
Lines 14-19 Link Here
14		14
15	/* System libraries. */	15	/* System libraries. */
16		16
		17	#include <unistd.h>
		18	#include <stdlib.h>
		19	#include <fcntl.h>
		20	#include <sys/wait.h>
17	#include <sys/types.h>	21	#include <sys/types.h>
18	#include <sys/param.h>	22	#include <sys/param.h>
19	#include <signal.h>	23	#include <signal.h>
Lines 25-32 Link Here
25	#include <syslog.h>	25	#include <syslog.h>
26	#include <string.h>	26	#include <string.h>
27		27
28	extern void exit();
29
30	/* Local stuff. */	28	/* Local stuff. */
31		29
32	#include "tcpd.h"	30	#include "tcpd.h"
33	-- a/tcpdchk.c	31	++ b/tcpdchk.c
Lines 20-25 Link Here
20		20
21	/* System libraries. */	21	/* System libraries. */
22		22
		23	#include <unistd.h>
		24	#include <stdlib.h>
23	#include <sys/types.h>	25	#include <sys/types.h>
24	#include <sys/stat.h>	26	#include <sys/stat.h>
25	#ifdef INET6	27	#ifdef INET6
Lines 35-44 Link Here
35	#include <netdb.h>	36	#include <netdb.h>
36	#include <string.h>	37	#include <string.h>
37		38
38	extern int errno;	39	unsigned long cidr_mask_addr(char *str);
39	extern void exit();
40	extern int optind;
41	extern char *optarg;
42		40
43	#ifndef INADDR_NONE	41	#ifndef INADDR_NONE
44	#define INADDR_NONE (-1) /* XXX should be 0xffffffff */	42	#define INADDR_NONE (-1) /* XXX should be 0xffffffff */
45	-- a/clean_exit.c	43	++ b/clean_exit.c
Lines 13-20 Link Here
13	#endif	13	#endif
14		14
15	#include <stdio.h>	15	#include <stdio.h>
16	#include <unistd.h>	16	#include <unistd.h>
17		17	#include <stdlib.h>
18	extern void exit();
19		18
20	#include "tcpd.h"	19	#include "tcpd.h"
21		20
22	-- a/hosts_access.c	21	++ b/hosts_access.c
Lines 23-28 Link Here
23		23
24	/* System libraries. */	24	/* System libraries. */
25		25
		26	#include <stdlib.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#ifdef INT32_T	28	#ifdef INT32_T
28	typedef uint32_t u_int32_t;	29	typedef uint32_t u_int32_t;
Lines 43-50 Link Here
43	#include <netdb.h>	44	#include <netdb.h>
44	#endif	45	#endif
45		46
46	extern char *fgets();	47	static int match_pattern_ylo(const char s, const char pattern);
47	extern int errno;	48	unsigned long cidr_mask_addr(char *str);
48		49
49	#ifndef INADDR_NONE	50	#ifndef INADDR_NONE
50	#define INADDR_NONE (-1) /* XXX should be 0xffffffff */	51	#define INADDR_NONE (-1) /* XXX should be 0xffffffff */
51	-- a/inetcf.c	52	++ b/inetcf.c
Lines 9-23 Link Here
9	static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23";	9	static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23";
10	#endif	10	#endif
11		11
		12	#include <stdlib.h>
12	#include <sys/types.h>	13	#include <sys/types.h>
13	#include <sys/stat.h>	14	#include <sys/stat.h>
14	#include <stdio.h>	15	#include <stdio.h>
15	#include <errno.h>	16	#include <errno.h>
16	#include <string.h>	17	#include <string.h>
17		18
18	extern int errno;	19	#include "scaffold.h"
19	extern void exit();
20
21	#include "tcpd.h"	20	#include "tcpd.h"
22	#include "inetcf.h"	21	#include "inetcf.h"
23		22
24	-- a/percent_x.c	23	++ b/percent_x.c
Lines 16-28 Link Here
16		16
17	/* System libraries. */	17	/* System libraries. */
18		18
		19	#include <stdlib.h>
19	#include <stdio.h>	20	#include <stdio.h>
20	#include <unistd.h>	21	#include <unistd.h>
21	#include <syslog.h>	22	#include <syslog.h>
22	#include <string.h>	23	#include <string.h>
23		24
24	extern void exit();
25
26	/* Local stuff. */	25	/* Local stuff. */
27		26
28	#include "tcpd.h"	27	#include "tcpd.h"
29	-- a/rfc931.c	28	++ b/rfc931.c
Lines 15-20 Link Here
15		15
16	/* System libraries. */	16	/* System libraries. */
17		17
		18	#include <unistd.h>
18	#include <stdio.h>	19	#include <stdio.h>
19	#include <syslog.h>	20	#include <syslog.h>
20	#include <sys/types.h>	21	#include <sys/types.h>
21	-- a/tcpd.c	22	++ b/tcpd.c
Lines 16-21 Link Here
16		16
17	/* System libraries. */	17	/* System libraries. */
18		18
		19	#include <unistd.h>
19	#include <sys/types.h>	20	#include <sys/types.h>
20	#include <sys/param.h>	21	#include <sys/param.h>
21	#include <sys/stat.h>	22	#include <sys/stat.h>
Lines 39-44 Link Here
39	#include "patchlevel.h"	39	#include "patchlevel.h"
40	#include "tcpd.h"	40	#include "tcpd.h"
41		41
		42	void fix_options(struct request_info *request);
		43
42	int allow_severity = SEVERITY; /* run-time adjustable */	44	int allow_severity = SEVERITY; /* run-time adjustable */
43	int deny_severity = LOG_WARNING; /* ditto */	45	int deny_severity = LOG_WARNING; /* ditto */
44		46
45	-- a/tcpdmatch.c	47	++ b/tcpdmatch.c
Lines 19-24 Link Here
19		19
20	/* System libraries. */	20	/* System libraries. */
21		21
		22	#include <unistd.h>
		23	#include <stdlib.h>
22	#include <sys/types.h>	24	#include <sys/types.h>
23	#include <sys/stat.h>	25	#include <sys/stat.h>
24	#include <sys/socket.h>	26	#include <sys/socket.h>
Lines 30-38 Link Here
30	#include <setjmp.h>	32	#include <setjmp.h>
31	#include <string.h>	33	#include <string.h>
32		34
33	extern void exit();
34	extern int optind;
35	extern char *optarg;
36		35
37	#ifndef INADDR_NONE	36	#ifndef INADDR_NONE
38	#define INADDR_NONE (-1) /* XXX should be 0xffffffff */	37	#define INADDR_NONE (-1) /* XXX should be 0xffffffff */
39	-- a/update.c	38	++ b/update.c
Lines 19-24 Link Here
19		19
20	/* System libraries */	20	/* System libraries */
21		21
		22	#include <unistd.h>
22	#include <stdio.h>	23	#include <stdio.h>
23	#include <syslog.h>	24	#include <syslog.h>
24	#include <string.h>	25	#include <string.h>
25	-- a/misc.c	26	++ b/misc.c
Lines 14-24 Link Here
14	#include <arpa/inet.h>	14	#include <arpa/inet.h>
15	#include <stdio.h>	15	#include <stdio.h>
16	#include <string.h>	16	#include <string.h>
		17	#include <stdlib.h>
17		18
18	#include "tcpd.h"	19	#include "tcpd.h"
19		20
20	extern char *fgets();
21
22	#ifndef INADDR_NONE	21	#ifndef INADDR_NONE
23	#define INADDR_NONE (-1) /* XXX should be 0xffffffff */	22	#define INADDR_NONE (-1) /* XXX should be 0xffffffff */
24	#endif	23	#endif
25	-- a/socket.c	24	++ b/socket.c
Lines 95-105 Link Here
95	static struct sockaddr_in client;	95	static struct sockaddr_in client;
96	static struct sockaddr_in server;	96	static struct sockaddr_in server;
97	#endif	97	#endif
98	#ifdef __GLIBC__	98	socklen_t len;
99	size_t len;
100	#else
101	int len;
102	#endif
103	char buf[BUFSIZ];	99	char buf[BUFSIZ];
104	int fd = request->fd;	100	int fd = request->fd;
105		101
Lines 430-440 Link Here
430	#else	426	#else
431	struct sockaddr_in sin;	427	struct sockaddr_in sin;
432	#endif	428	#endif
433	#ifdef __GLIBC__	429	socklen_t size;
434	size_t size = sizeof(sin);
435	#else
436	int size = sizeof(sin);
437	#endif
438		430
439	/*	431	/*
440	* Eat up the not-yet received datagram. Some systems insist on a	432	* Eat up the not-yet received datagram. Some systems insist on a

Return to bug 647210