From owner-svn-src-all@FreeBSD.ORG  Fri May 31 22:55:24 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7CF03ABF;
 Fri, 31 May 2013 22:55:24 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6F5378B;
 Fri, 31 May 2013 22:55:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4VMtOth003336;
 Fri, 31 May 2013 22:55:24 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4VMtOBO003335;
 Fri, 31 May 2013 22:55:24 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201305312255.r4VMtOBO003335@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 31 May 2013 22:55:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251210 - head/contrib/tcpdump
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 May 2013 22:55:24 -0000

Author: delphij
Date: Fri May 31 22:55:23 2013
New Revision: 251210
URL: http://svnweb.freebsd.org/changeset/base/251210

Log:
  MFV: Redo the fixup using the submitted version accepted by upstream.

Modified:
  head/contrib/tcpdump/print-rip.c
Directory Properties:
  head/contrib/tcpdump/   (props changed)

Modified: head/contrib/tcpdump/print-rip.c
==============================================================================
--- head/contrib/tcpdump/print-rip.c	Fri May 31 22:55:21 2013	(r251209)
+++ head/contrib/tcpdump/print-rip.c	Fri May 31 22:55:23 2013	(r251210)
@@ -17,8 +17,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
@@ -143,7 +141,7 @@ rip_entry_print_v2(register const struct
 				putchar (isprint(*p) ? *p : '.');
 		} else if (auth_type == 3) {
 			printf("\n\t  Auth header:");
-			printf(" Packet Len %u,", EXTRACT_16BITS((u_int16_t *)ni + 2));
+			printf(" Packet Len %u,", EXTRACT_16BITS((u_int8_t *)ni + 4));
 			printf(" Key-ID %u,", *((u_int8_t *)ni + 6));
 			printf(" Auth Data Len %u,", *((u_int8_t *)ni + 7));
 			printf(" SeqNo %u,", EXTRACT_32BITS(&ni->rip_dest_mask));