"Christos Zoulas" <christos%netbsd.org@localhost> writes:
> Module Name: src
> Committed By: christos
> Date: Wed Jun 5 19:01:26 UTC 2013
>
> Modified Files:
> src/sys/kern: init_main.c
> src/sys/netinet: in_pcb.c in_proto.c ip_icmp.c ip_input.c ip_mroute.c
> ip_output.c raw_ip.c tcp_input.c tcp_output.c tcp_subr.c
> udp_usrreq.c
> src/sys/netinet6: icmp6.c in6_pcb.c in6_proto.c ip6_forward.c
> ip6_input.c ip6_output.c raw_ip6.c
> src/sys/netipsec: files.netipsec key.c xform_ipip.c
>
> Log Message:
> IPSEC has not come in two speeds for a long time now (IPSEC == kame,
> FAST_IPSEC). Make everything refer to IPSEC to avoid confusion.
Besides s/FAST_IPSEC/IPSEC/g (fine) and some whitespace cleanup, I
found:
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.325 src/sys/netinet/tcp_input.c:1.326
--- src/sys/netinet/tcp_input.c:1.325 Fri Jun 22 15:09:36 2012
+++ src/sys/netinet/tcp_input.c Wed Jun 5 19:01:26 2013
@@ -3421,11 +3417,7 @@
tcp_fields_to_host(th);
if (sav == NULL)
return (-1);
-#ifdef FAST_IPSEC
- KEY_FREESAV(&sav);
-#else
- key_freesav(sav);
-#endif
+ KEY_FREESAV(sav);
return (-1);
}
tcp_fields_to_host(th);
which looks like either a logic bug or something that won't build (note
disappearing &in argument to KEY_FREESAV. Did this pass a build.sh
release?
Attachment:
pgpMjGVDYbCJv.pgp
Description: PGP signature