patches/tcp_wrappers/rfc931.diff

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