Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libwrap/tcpd.h,v rcsdiff: /ftp/cvs/cvsroot/src/lib/libwrap/tcpd.h,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.12.56.1 retrieving revision 1.12.56.2 diff -u -p -r1.12.56.1 -r1.12.56.2 --- src/lib/libwrap/tcpd.h 2012/04/23 16:48:56 1.12.56.1 +++ src/lib/libwrap/tcpd.h 2012/04/23 23:40:41 1.12.56.2 @@ -1,4 +1,4 @@ -/* $NetBSD: tcpd.h,v 1.12.56.1 2012/04/23 16:48:56 riz Exp $ */ +/* $NetBSD: tcpd.h,v 1.12.56.2 2012/04/23 23:40:41 riz Exp $ */ /* * @(#) tcpd.h 1.5 96/03/19 16:22:24 * @@ -29,10 +29,14 @@ struct request_info { char pid[10]; /* access via eval_pid(request) */ struct host_info client[1]; /* client endpoint info */ struct host_info server[1]; /* server endpoint info */ - void (*sink)(int); /* datagram sink function or 0 */ - void (*hostname)(struct host_info *); /* address to printable hostname */ - void (*hostaddr)(struct host_info *); /* address to printable address */ - void (*cleanup)(void); /* cleanup function or 0 */ + void (*sink) /* datagram sink function or 0 */ + __P((int)); + void (*hostname) /* address to printable hostname */ + __P((struct host_info *)); + void (*hostaddr) /* address to printable address */ + __P((struct host_info *)); + void (*cleanup) /* cleanup function or 0 */ + __P((void)); struct netconfig *config; /* netdir handle */ }; @@ -70,32 +74,32 @@ __BEGIN_DECLS #define fromhost sock_host /* no TLI support needed */ extern int hosts_access /* access control */ - (struct request_info *); + __P((struct request_info *)); extern int hosts_ctl /* limited interface to hosts_access */ - (char *, char *, char *, char *); + __P((char *, char *, char *, char *)); extern void shell_cmd /* execute shell command */ - (char *); + __P((char *)); extern char *percent_x /* do % expansion */ - (char *, int, char *, struct request_info *); + __P((char *, int, char *, struct request_info *)); extern void rfc931 /* client name from RFC 931 daemon */ - (struct sockaddr *, struct sockaddr *, char *); + __P((struct sockaddr *, struct sockaddr *, char *)); extern void clean_exit /* clean up and exit */ - (struct request_info *); + __P((struct request_info *)); extern void refuse /* clean up and exit */ - (struct request_info *); + __P((struct request_info *)); extern char *xgets /* fgets() on steroids */ - (char *, int, FILE *); + __P((char *, int, FILE *)); extern char *split_at /* strchr() and split */ - (char *, int); + __P((char *, int)); extern int dot_quad_addr /* restricted inet_aton() */ - (char *, unsigned long *); + __P((char *, unsigned long *)); /* Global variables. */ extern int allow_severity; /* for connection logging */ extern int deny_severity; /* for connection logging */ -extern const char *hosts_allow_table; /* for verification mode redirection */ -extern const char *hosts_deny_table; /* for verification mode redirection */ +extern char *hosts_allow_table; /* for verification mode redirection */ +extern char *hosts_deny_table; /* for verification mode redirection */ extern int hosts_access_verbose; /* for verbose matching mode */ extern int rfc931_timeout; /* user lookup timeout */ extern int resident; /* > 0 if resident process */ @@ -106,9 +110,9 @@ extern int resident; /* > 0 if residen */ extern struct request_info *request_init /* initialize request */ - (struct request_info *,...); + __P((struct request_info *,...)); extern struct request_info *request_set /* update request structure */ - (struct request_info *,...); + __P((struct request_info *,...)); #define RQ_FILE 1 /* file descriptor */ #define RQ_DAEMON 2 /* server process (argv[0]) */ @@ -129,28 +133,28 @@ extern struct request_info *request_set */ extern char *eval_user /* client user */ - (struct request_info *); + __P((struct request_info *)); extern char *eval_hostname /* printable hostname */ - (struct host_info *); + __P((struct host_info *)); extern char *eval_hostaddr /* printable host address */ - (struct host_info *); + __P((struct host_info *)); extern char *eval_hostinfo /* host name or address */ - (struct host_info *); + __P((struct host_info *)); extern char *eval_client /* whatever is available */ - (struct request_info *); + __P((struct request_info *)); extern char *eval_server /* whatever is available */ - (struct request_info *); + __P((struct request_info *)); #define eval_daemon(r) ((r)->daemon) /* daemon process name */ #define eval_pid(r) ((r)->pid) /* process id */ /* Socket-specific methods, including DNS hostname lookups. */ extern void sock_host /* look up endpoint addresses */ - (struct request_info *); + __P((struct request_info *)); extern void sock_hostname /* translate address to hostname */ - (struct host_info *); + __P((struct host_info *)); extern void sock_hostaddr /* address to printable address */ - (struct host_info *); + __P((struct host_info *)); #define sock_methods(r) \ { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; } @@ -158,7 +162,7 @@ extern void sock_hostaddr /* address to #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) extern void tli_host /* look up endpoint addresses etc. */ - (struct request_info *); + __P((struct request_info *)); #endif /* @@ -168,15 +172,15 @@ extern void tli_host /* look up endpoi */ extern void tcpd_warn /* report problem and proceed */ - (const char *, ...) + __P((char *, ...)) __attribute__((__format__(__printf__, 1, 2))); extern void tcpd_jump /* report problem and jump */ - (const char *, ...) + __P((char *, ...)) __attribute__((__format__(__printf__, 1, 2))); __END_DECLS struct tcpd_context { - const char *file; /* current file */ + char *file; /* current file */ int line; /* current line */ }; __BEGIN_DECLS @@ -203,8 +207,8 @@ __END_DECLS __BEGIN_DECLS extern void process_options /* execute options */ - (char *, struct request_info *); + __P((char *, struct request_info *)); extern int dry_run; /* verification flag */ extern void fix_options /* get rid of IP-level socket options */ - (struct request_info *); + __P((struct request_info *)); __END_DECLS