Module Name: src
Committed By: drochner
Date: Thu May 5 20:15:15 UTC 2011
Modified Files:
src/sys/netipsec: xform_esp.c xform_ipcomp.c
Log Message:
fix C&P botch in diagnostic printfs
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/netipsec/xform_esp.c
cvs rdiff -u -r1.26 -r1.27 src/sys/netipsec/xform_ipcomp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.32 src/sys/netipsec/xform_esp.c:1.33
--- src/sys/netipsec/xform_esp.c:1.32 Thu May 5 17:48:29 2011
+++ src/sys/netipsec/xform_esp.c Thu May 5 20:15:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_esp.c,v 1.32 2011/05/05 17:48:29 drochner Exp $ */
+/* $NetBSD: xform_esp.c,v 1.33 2011/05/05 20:15:14 drochner Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.32 2011/05/05 17:48:29 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.33 2011/05/05 20:15:14 drochner Exp $");
#include "opt_inet.h"
#ifdef __FreeBSD__
@@ -516,7 +516,7 @@
saidx = &sav->sah->saidx;
IPSEC_ASSERT(saidx->dst.sa.sa_family == AF_INET ||
saidx->dst.sa.sa_family == AF_INET6,
- ("ah_input_cb: unexpected protocol family %u",
+ ("esp_input_cb: unexpected protocol family %u",
saidx->dst.sa.sa_family));
esph = sav->tdb_authalgxform;
Index: src/sys/netipsec/xform_ipcomp.c
diff -u src/sys/netipsec/xform_ipcomp.c:1.26 src/sys/netipsec/xform_ipcomp.c:1.27
--- src/sys/netipsec/xform_ipcomp.c:1.26 Fri Apr 1 08:29:29 2011
+++ src/sys/netipsec/xform_ipcomp.c Thu May 5 20:15:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ipcomp.c,v 1.26 2011/04/01 08:29:29 spz Exp $ */
+/* $NetBSD: xform_ipcomp.c,v 1.27 2011/05/05 20:15:15 drochner Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.26 2011/04/01 08:29:29 spz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.27 2011/05/05 20:15:15 drochner Exp $");
/* IP payload compression protocol (IPComp), see RFC 2393 */
#include "opt_inet.h"
@@ -273,7 +273,7 @@
saidx = &sav->sah->saidx;
IPSEC_ASSERT(saidx->dst.sa.sa_family == AF_INET ||
saidx->dst.sa.sa_family == AF_INET6,
- ("ah_input_cb: unexpected protocol family %u",
+ ("ipcomp_input_cb: unexpected protocol family %u",
saidx->dst.sa.sa_family));
/* Check for crypto errors */