diff options
| author | darrenr <darrenr@FreeBSD.org> | 2001-07-28 11:58:26 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2001-07-28 11:58:26 +0000 |
| commit | d58b006a82e8cfe96cab1fa3db3626ecc10b7394 (patch) | |
| tree | bf3386d7fdd263e4118db801dd9684a155d8d1d1 /sys/contrib/ipfilter/netinet/ip_auth.h | |
| parent | 933d065af2139670a009454cfec34923cd3d4756 (diff) | |
| download | FreeBSD-src-d58b006a82e8cfe96cab1fa3db3626ecc10b7394.zip FreeBSD-src-d58b006a82e8cfe96cab1fa3db3626ecc10b7394.tar.gz | |
fix conflicts created by import
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_auth.h')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_auth.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_auth.h b/sys/contrib/ipfilter/netinet/ip_auth.h index 2851c3d..638a03d 100644 --- a/sys/contrib/ipfilter/netinet/ip_auth.h +++ b/sys/contrib/ipfilter/netinet/ip_auth.h @@ -1,11 +1,8 @@ /* - * Copyright (C) 1997-2000 by Darren Reed & Guido Van Rooij. + * Copyright (C) 1997-2001 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 - * to the original author and the contributors. + * See the IPFILTER.LICENCE file for details on licencing. * - * $Id: ip_auth.h,v 2.1 1999/08/04 17:29:54 darrenr Exp $ * $FreeBSD$ * */ @@ -56,8 +53,8 @@ extern void fr_authunload __P((void)); extern mb_t *fr_authpkts[]; extern int fr_newauth __P((mb_t *, fr_info_t *, ip_t *)); #if defined(__NetBSD__) || defined(__OpenBSD__) -extern int fr_auth_ioctl __P((caddr_t, u_long, frentry_t *, frentry_t **)); +extern int fr_auth_ioctl __P((caddr_t, int, u_long, frentry_t *, frentry_t **)); #else -extern int fr_auth_ioctl __P((caddr_t, int, frentry_t *, frentry_t **)); +extern int fr_auth_ioctl __P((caddr_t, int, int, frentry_t *, frentry_t **)); #endif #endif /* __IP_AUTH_H__ */ |
