diff options
| author | darrenr <darrenr@FreeBSD.org> | 2000-05-24 03:17:16 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2000-05-24 03:17:16 +0000 |
| commit | e517ff28a4759f0bbeb5c846451323e3b55ababd (patch) | |
| tree | 79e3da5aa40f4a410e0bab451990b9c288ead021 /sys/netinet/ip_auth.h | |
| parent | 553f5accf7e7a2648d008eb8aa979068bf490f4f (diff) | |
| download | FreeBSD-src-e517ff28a4759f0bbeb5c846451323e3b55ababd.zip FreeBSD-src-e517ff28a4759f0bbeb5c846451323e3b55ababd.tar.gz | |
fix conflicts
Diffstat (limited to 'sys/netinet/ip_auth.h')
| -rw-r--r-- | sys/netinet/ip_auth.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/netinet/ip_auth.h b/sys/netinet/ip_auth.h index e6b5a59..8be860c 100644 --- a/sys/netinet/ip_auth.h +++ b/sys/netinet/ip_auth.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-1998 by Darren Reed & Guido Van Rooij. + * Copyright (C) 1997-2000 by Darren Reed & Guido Van Rooij. * * Redistribution and use in source and binary forms are permitted * provided that this notice is preserved and due credit is given @@ -51,15 +51,12 @@ extern int fr_authstart; extern int fr_authend; extern int fr_authsize; extern int fr_authused; +extern int fr_auth_lock; extern u_32_t fr_checkauth __P((ip_t *, fr_info_t *)); extern void fr_authexpire __P((void)); extern void fr_authunload __P((void)); extern mb_t *fr_authpkts[]; -#if defined(_KERNEL) && SOLARIS -extern int fr_newauth __P((mb_t *, fr_info_t *, ip_t *, qif_t *)); -#else extern int fr_newauth __P((mb_t *, fr_info_t *, ip_t *)); -#endif #if defined(__NetBSD__) || defined(__OpenBSD__) extern int fr_auth_ioctl __P((caddr_t, u_long, frentry_t *, frentry_t **)); #else |
