From 48b4ca8e6a57c62a30178ad743504003bfd60b92 Mon Sep 17 00:00:00 2001 From: darrenr Date: Sun, 4 Feb 2001 14:26:56 +0000 Subject: fix conflicts --- sys/netinet/ip_auth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/netinet/ip_auth.c') diff --git a/sys/netinet/ip_auth.c b/sys/netinet/ip_auth.c index 7fb9d21..2931cc6 100644 --- a/sys/netinet/ip_auth.c +++ b/sys/netinet/ip_auth.c @@ -350,7 +350,7 @@ fr_authioctlloop: READ_ENTER(&ipf_auth); if ((fr_authnext != fr_authend) && fr_authpkts[fr_authnext]) { error = IWCOPYPTR((char *)&fr_auth[fr_authnext], data, - sizeof(fr_info_t)); + sizeof(frauth_t)); RWLOCK_EXIT(&ipf_auth); if (error) break; -- cgit v1.1