[BACK]Return to tcpd.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / lib / libwrap

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/lib/libwrap/tcpd.h between version 1.12.56.2 and 1.13

version 1.12.56.2, 2012/04/23 23:40:41 version 1.13, 2012/03/21 10:10:37
Line 29  struct request_info {
Line 29  struct request_info {
     char    pid[10];                    /* access via eval_pid(request) */      char    pid[10];                    /* access via eval_pid(request) */
     struct host_info client[1];         /* client endpoint info */      struct host_info client[1];         /* client endpoint info */
     struct host_info server[1];         /* server endpoint info */      struct host_info server[1];         /* server endpoint info */
     void  (*sink)                       /* datagram sink function or 0 */      void (*sink)(int);                  /* datagram sink function or 0 */
                 __P((int));      void (*hostname)(struct host_info *); /* address to printable hostname */
     void  (*hostname)                   /* address to printable hostname */      void (*hostaddr)(struct host_info *); /* address to printable address */
                 __P((struct host_info *));      void (*cleanup)(void);              /* cleanup function or 0 */
     void  (*hostaddr)                   /* address to printable address */  
                 __P((struct host_info *));  
     void  (*cleanup)                    /* cleanup function or 0 */  
                 __P((void));  
     struct netconfig *config;           /* netdir handle */      struct netconfig *config;           /* netdir handle */
 };  };
   
Line 74  __BEGIN_DECLS
Line 70  __BEGIN_DECLS
 #define fromhost sock_host              /* no TLI support needed */  #define fromhost sock_host              /* no TLI support needed */
   
 extern int hosts_access                 /* access control */  extern int hosts_access                 /* access control */
                 __P((struct request_info *));                  (struct request_info *);
 extern int hosts_ctl                    /* limited interface to hosts_access */  extern int hosts_ctl                    /* limited interface to hosts_access */
                 __P((char *, char *, char *, char *));                  (char *, char *, char *, char *);
 extern void shell_cmd                   /* execute shell command */  extern void shell_cmd                   /* execute shell command */
                 __P((char *));                  (char *);
 extern char *percent_x                  /* do %<char> expansion */  extern char *percent_x                  /* do %<char> expansion */
                 __P((char *, int, char *, struct request_info *));                  (char *, int, char *, struct request_info *);
 extern void rfc931                      /* client name from RFC 931 daemon */  extern void rfc931                      /* client name from RFC 931 daemon */
                 __P((struct sockaddr *, struct sockaddr *, char *));                  (struct sockaddr *, struct sockaddr *, char *);
 extern void clean_exit                  /* clean up and exit */  extern void clean_exit                  /* clean up and exit */
                 __P((struct request_info *));                  (struct request_info *);
 extern void refuse                      /* clean up and exit */  extern void refuse                      /* clean up and exit */
                 __P((struct request_info *));                  (struct request_info *);
 extern char *xgets                      /* fgets() on steroids */  extern char *xgets                      /* fgets() on steroids */
                 __P((char *, int, FILE *));                  (char *, int, FILE *);
 extern char *split_at                   /* strchr() and split */  extern char *split_at                   /* strchr() and split */
                 __P((char *, int));                  (char *, int);
 extern int dot_quad_addr        /* restricted inet_aton() */  extern int dot_quad_addr        /* restricted inet_aton() */
                 __P((char *, unsigned long *));                  (char *, unsigned long *);
   
 /* Global variables. */  /* Global variables. */
   
 extern int allow_severity;              /* for connection logging */  extern int allow_severity;              /* for connection logging */
 extern int deny_severity;               /* for connection logging */  extern int deny_severity;               /* for connection logging */
 extern char *hosts_allow_table;         /* for verification mode redirection */  extern const char *hosts_allow_table;   /* for verification mode redirection */
 extern char *hosts_deny_table;          /* for verification mode redirection */  extern const char *hosts_deny_table;    /* for verification mode redirection */
 extern int hosts_access_verbose;        /* for verbose matching mode */  extern int hosts_access_verbose;        /* for verbose matching mode */
 extern int rfc931_timeout;              /* user lookup timeout */  extern int rfc931_timeout;              /* user lookup timeout */
 extern int resident;                    /* > 0 if resident process */  extern int resident;                    /* > 0 if resident process */
Line 110  extern int resident;   /* > 0 if residen
Line 106  extern int resident;   /* > 0 if residen
   */    */
   
 extern struct request_info *request_init        /* initialize request */  extern struct request_info *request_init        /* initialize request */
                 __P((struct request_info *,...));                  (struct request_info *,...);
 extern struct request_info *request_set         /* update request structure */  extern struct request_info *request_set         /* update request structure */
                 __P((struct request_info *,...));                  (struct request_info *,...);
   
 #define RQ_FILE         1               /* file descriptor */  #define RQ_FILE         1               /* file descriptor */
 #define RQ_DAEMON       2               /* server process (argv[0]) */  #define RQ_DAEMON       2               /* server process (argv[0]) */
Line 133  extern struct request_info *request_set 
Line 129  extern struct request_info *request_set 
   */    */
   
 extern char *eval_user                  /* client user */  extern char *eval_user                  /* client user */
                 __P((struct request_info *));                  (struct request_info *);
 extern char *eval_hostname              /* printable hostname */  extern char *eval_hostname              /* printable hostname */
                 __P((struct host_info *));                  (struct host_info *);
 extern char *eval_hostaddr              /* printable host address */  extern char *eval_hostaddr              /* printable host address */
                 __P((struct host_info *));                  (struct host_info *);
 extern char *eval_hostinfo              /* host name or address */  extern char *eval_hostinfo              /* host name or address */
                 __P((struct host_info *));                  (struct host_info *);
 extern char *eval_client                /* whatever is available */  extern char *eval_client                /* whatever is available */
                 __P((struct request_info *));                  (struct request_info *);
 extern char *eval_server                /* whatever is available */  extern char *eval_server                /* whatever is available */
                 __P((struct request_info *));                  (struct request_info *);
 #define eval_daemon(r)  ((r)->daemon)   /* daemon process name */  #define eval_daemon(r)  ((r)->daemon)   /* daemon process name */
 #define eval_pid(r)     ((r)->pid)      /* process id */  #define eval_pid(r)     ((r)->pid)      /* process id */
   
 /* Socket-specific methods, including DNS hostname lookups. */  /* Socket-specific methods, including DNS hostname lookups. */
   
 extern void sock_host                   /* look up endpoint addresses */  extern void sock_host                   /* look up endpoint addresses */
                 __P((struct request_info *));                  (struct request_info *);
 extern void sock_hostname               /* translate address to hostname */  extern void sock_hostname               /* translate address to hostname */
                 __P((struct host_info *));                  (struct host_info *);
 extern void sock_hostaddr               /* address to printable address */  extern void sock_hostaddr               /* address to printable address */
                 __P((struct host_info *));                  (struct host_info *);
 #define sock_methods(r) \  #define sock_methods(r) \
         { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }          { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
   
Line 162  extern void sock_hostaddr  /* address to
Line 158  extern void sock_hostaddr  /* address to
   
 #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)  #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
 extern void tli_host                    /* look up endpoint addresses etc. */  extern void tli_host                    /* look up endpoint addresses etc. */
                 __P((struct request_info *));                  (struct request_info *);
 #endif  #endif
   
  /*   /*
Line 172  extern void tli_host   /* look up endpoi
Line 168  extern void tli_host   /* look up endpoi
   */    */
   
 extern void tcpd_warn                   /* report problem and proceed */  extern void tcpd_warn                   /* report problem and proceed */
                 __P((char *, ...))                  (const char *, ...)
         __attribute__((__format__(__printf__, 1, 2)));          __attribute__((__format__(__printf__, 1, 2)));
 extern void tcpd_jump                   /* report problem and jump */  extern void tcpd_jump                   /* report problem and jump */
                 __P((char *, ...))                  (const char *, ...)
         __attribute__((__format__(__printf__, 1, 2)));          __attribute__((__format__(__printf__, 1, 2)));
 __END_DECLS  __END_DECLS
   
 struct tcpd_context {  struct tcpd_context {
     char   *file;                       /* current file */      const char *file;                   /* current file */
     int     line;                       /* current line */      int     line;                       /* current line */
 };  };
 __BEGIN_DECLS  __BEGIN_DECLS
Line 207  __END_DECLS
Line 203  __END_DECLS
   
 __BEGIN_DECLS  __BEGIN_DECLS
 extern void process_options             /* execute options */  extern void process_options             /* execute options */
                 __P((char *, struct request_info *));                  (char *, struct request_info *);
 extern int dry_run;                     /* verification flag */  extern int dry_run;                     /* verification flag */
 extern void fix_options                 /* get rid of IP-level socket options */  extern void fix_options                 /* get rid of IP-level socket options */
                 __P((struct request_info *));                  (struct request_info *);
 __END_DECLS  __END_DECLS

Legend:
Removed from v.1.12.56.2  
changed lines
  Added in v.1.13

CVSweb <webmaster@jp.NetBSD.org>