| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | |
| 3 | diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c |
| 4 | --- tcp_wrappers_7.6.orig/scaffold.c 2005-03-09 18:22:04.000000000 +0100 |
| 5 | +++ tcp_wrappers_7.6/scaffold.c 2005-03-09 18:20:47.000000000 +0100 |
| 6 | @@ -237,10 +237,17 @@ struct request_info *request; |
| 7 | |
| 8 | /* ARGSUSED */ |
| 9 | |
| 10 | -void rfc931(request) |
| 11 | -struct request_info *request; |
| 12 | +void rfc931(rmt_sin, our_sin, dest) |
| 13 | +#ifdef INET6 |
| 14 | +struct sockaddr *rmt_sin; |
| 15 | +struct sockaddr *our_sin; |
| 16 | +#else |
| 17 | +struct sockaddr_in *rmt_sin; |
| 18 | +struct sockaddr_in *our_sin; |
| 19 | +#endif |
| 20 | +char *dest; |
| 21 | { |
| 22 | - strcpy(request->user, unknown); |
| 23 | + strcpy(dest, unknown); |
| 24 | } |
| 25 | |
| 26 | /* check_path - examine accessibility */ |
| 27 | diff -ruNp tcp_wrappers_7.6.orig/tcpd.h tcp_wrappers_7.6/tcpd.h |
| 28 | --- tcp_wrappers_7.6.orig/tcpd.h 2005-03-09 18:22:04.000000000 +0100 |
| 29 | +++ tcp_wrappers_7.6/tcpd.h 2005-03-09 18:21:23.000000000 +0100 |
| 30 | @@ -83,7 +83,11 @@ extern int hosts_access(struct request_i |
| 31 | extern void shell_cmd(char *); /* execute shell command */ |
| 32 | extern char *percent_x(char *, int, char *, struct request_info *); |
| 33 | /* do %<char> expansion */ |
| 34 | +#ifdef INET6 |
| 35 | extern void rfc931(struct sockaddr *, struct sockaddr *, char *); |
| 36 | +#else |
| 37 | +extern void rfc931(struct sockaddr_in *, struct sockaddr_in *, char *); |
| 38 | +#endif |
| 39 | /* client name from RFC 931 daemon */ |
| 40 | extern void clean_exit(struct request_info *); /* clean up and exit */ |
| 41 | extern void refuse(struct request_info *); /* clean up and exit */ |