Module Name: src
Committed By: vanhu
Date: Tue Mar 1 14:33:58 UTC 2011
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: isakmp.c pfkey.c
Log Message:
plog text fixes, patch from M E Andersson <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/crypto/dist/ipsec-tools/src/racoon/isakmp.c
cvs rdiff -u -r1.54 -r1.55 src/crypto/dist/ipsec-tools/src/racoon/pfkey.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.67 src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.68
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.67 Wed Feb 2 15:21:34 2011
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp.c Tue Mar 1 14:33:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp.c,v 1.67 2011/02/02 15:21:34 vanhu Exp $ */
+/* $NetBSD: isakmp.c,v 1.68 2011/03/01 14:33:58 vanhu Exp $ */
/* Id: isakmp.c,v 1.74 2006/05/07 21:32:59 manubsd Exp */
@@ -3422,7 +3422,7 @@
dst = iph2->dst;
plog(LLV_INFO, LOCATION, NULL,
- "generated policy, deleting it.\n");
+ "deleting a generated policy.\n");
memset(&spidx, 0, sizeof(spidx));
iph2->spidx_gen = (caddr_t )&spidx;
Index: src/crypto/dist/ipsec-tools/src/racoon/pfkey.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.54 src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.55
--- src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.54 Fri Nov 12 10:36:37 2010
+++ src/crypto/dist/ipsec-tools/src/racoon/pfkey.c Tue Mar 1 14:33:58 2011
@@ -1,6 +1,6 @@
-/* $NetBSD: pfkey.c,v 1.54 2010/11/12 10:36:37 tteras Exp $ */
+/* $NetBSD: pfkey.c,v 1.55 2011/03/01 14:33:58 vanhu Exp $ */
-/* $Id: pfkey.c,v 1.54 2010/11/12 10:36:37 tteras Exp $ */
+/* $Id: pfkey.c,v 1.55 2011/03/01 14:33:58 vanhu Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -231,7 +231,7 @@
}
}
- plog(LLV_DEBUG, LOCATION, NULL, "get pfkey %s message\n",
+ plog(LLV_DEBUG, LOCATION, NULL, "got pfkey %s message\n",
s_pfkey_type(msg->sadb_msg_type));
plogdump(LLV_DEBUG2, msg, msg->sadb_msg_len << 3);
@@ -2344,8 +2344,8 @@
sp = getsp(&spidx);
if (sp == NULL) {
- plog(LLV_ERROR, LOCATION, NULL,
- "such policy does not already exist: \"%s\"\n",
+ plog(LLV_DEBUG, LOCATION, NULL,
+ "this policy did not exist for removal: \"%s\"\n",
spidx2str(&spidx));
} else {
/* preserve hints before deleting the SP */
@@ -3611,8 +3611,8 @@
break;
case IPSECDOI_PROTO_IPCOMP:
plog(LLV_DEBUG, LOCATION, NULL,
- "compression algorithm can not be checked "
- "because sadb message doesn't support it.\n");
+ "no check of compression algorithm; "
+ "not supported in sadb message.\n");
return 0;
default:
plog(LLV_ERROR, LOCATION, NULL,
