diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-08-06 17:35:03 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-08-06 17:35:03 +0000 |
| commit | 53bc285fea0ac9913daea03e21003f09853a9762 (patch) | |
| tree | 446611e84564399887dae5140178651ba46bb53b /libexec/identd | |
| parent | e17b369caea005f55630416e6f6878b009e95526 (diff) | |
Wall
Diffstat (limited to 'libexec/identd')
| -rw-r--r-- | libexec/identd/identd.h | 11 | ||||
| -rw-r--r-- | libexec/identd/openbsd.c | 4 | ||||
| -rw-r--r-- | libexec/identd/parse.c | 5 | ||||
| -rw-r--r-- | libexec/identd/proxy.c | 8 |
4 files changed, 10 insertions, 18 deletions
diff --git a/libexec/identd/identd.h b/libexec/identd/identd.h index f2203438c9c..e8ba11a66bb 100644 --- a/libexec/identd/identd.h +++ b/libexec/identd/identd.h @@ -1,5 +1,5 @@ /* -** $Id: identd.h,v 1.3 1998/09/16 20:22:15 deraadt Exp $ +** $Id: identd.h,v 1.4 1999/08/06 17:35:02 deraadt Exp $ ** ** identd.h Common variables for the Pidentd daemon ** @@ -36,11 +36,8 @@ extern char *indirect_password; extern int lport; extern int fport; -extern char *gethost(); - -extern int k_open(); -extern int k_getuid(); -extern int parse(); -extern int parse_config(); +int parse __P((int, struct in_addr *, struct in_addr *)); +char *gethost __P((struct in_addr *)); +int k_getuid __P((struct in_addr *, int, struct in_addr *, int, uid_t *)); #endif diff --git a/libexec/identd/openbsd.c b/libexec/identd/openbsd.c index c32a2fe9b10..7fba5f280e5 100644 --- a/libexec/identd/openbsd.c +++ b/libexec/identd/openbsd.c @@ -4,7 +4,7 @@ * * Please send bug fixes/bug reports to: Peter Eriksson <pen@lysator.liu.se> * - * $Id: openbsd.c,v 1.12 1998/06/23 11:38:41 deraadt Exp $ + * $Id: openbsd.c,v 1.13 1999/08/06 17:35:02 deraadt Exp $ * This version elminates the kmem search in favour of a kernel sysctl to * get the user id associated with a connection - Bob Beck <beck@obtuse.com> */ @@ -40,7 +40,7 @@ k_getuid(faddr, fport, laddr, lport, uid) int fport; struct in_addr *laddr; int lport; - int *uid; + uid_t *uid; { struct tcp_ident_mapping tir; struct sockaddr_in *fin, *lin; diff --git a/libexec/identd/parse.c b/libexec/identd/parse.c index 7a3d5e9eab7..c31752d00e1 100644 --- a/libexec/identd/parse.c +++ b/libexec/identd/parse.c @@ -26,17 +26,16 @@ #define IO_TIMEOUT 30 /* Timeout I/O operations after N seconds */ -static int check_noident __P((char *)); +int check_noident __P((char *)); ssize_t timed_read __P((int, void *, size_t, time_t)); ssize_t timed_write __P((int, const void *, size_t, time_t)); -int parse __P((int, struct in_addr *, struct in_addr *)); void gentoken __P((char *, int)); /* * A small routine to check for the existance of the ".noident" * file in a users home directory. */ -static int +int check_noident(homedir) char *homedir; { diff --git a/libexec/identd/proxy.c b/libexec/identd/proxy.c index 9dc7db8c695..0c572f0b2b6 100644 --- a/libexec/identd/proxy.c +++ b/libexec/identd/proxy.c @@ -7,16 +7,12 @@ #include <stdio.h> #include <errno.h> - -#include "identd.h" - -#ifdef INCLUDE_PROXY #include <sys/types.h> #include <sys/time.h> +#include <sys/socket.h> #include <netinet/in.h> -#include <ident.h> -#endif +#include "identd.h" /* * This function should establish a connection to a remote IDENT |