Module Name: src
Committed By: riz
Date: Tue Oct 23 19:44:45 UTC 2012
Modified Files:
src/sbin/ping [netbsd-6]: ping.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #621):
sbin/ping/ping.c: revision 1.103
Fix a bug that misunderstand F_TIMING64, F_POLICY and F_AUTHHDR.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.102.2.1 src/sbin/ping/ping.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ping/ping.c
diff -u src/sbin/ping/ping.c:1.102 src/sbin/ping/ping.c:1.102.2.1
--- src/sbin/ping/ping.c:1.102 Wed Jan 4 16:09:42 2012
+++ src/sbin/ping/ping.c Tue Oct 23 19:44:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ping.c,v 1.102 2012/01/04 16:09:42 drochner Exp $ */
+/* $NetBSD: ping.c,v 1.102.2.1 2012/10/23 19:44:44 riz Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ping.c,v 1.102 2012/01/04 16:09:42 drochner Exp $");
+__RCSID("$NetBSD: ping.c,v 1.102.2.1 2012/10/23 19:44:44 riz Exp $");
#endif
#include <stdio.h>
@@ -116,10 +116,10 @@ __RCSID("$NetBSD: ping.c,v 1.102 2012/01
#define F_TIMING64 0x10000 /* 64 bit time, nanoseconds */
#ifdef IPSEC
#ifdef IPSEC_POLICY_IPSEC
-#define F_POLICY 0x10000
+#define F_POLICY 0x20000
#else
-#define F_AUTHHDR 0x10000
-#define F_ENCRYPT 0x20000
+#define F_AUTHHDR 0x20000
+#define F_ENCRYPT 0x40000
#endif /*IPSEC_POLICY_IPSEC*/
#endif /*IPSEC*/
