From Raphael Raimbault <[email protected]>: "-tttt" requires

the time zone offset, so get it with "gmt2local()" if "tflag" is -3.

diff --git a/CREDITS b/CREDITS
index 2e36f38184a40d956fda92f4c6669079ff6ae421..0f497517e693348d594b7580312a07c4cdcfbf6a 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -99,6 +99,7 @@ Additional people who have contributed patches:
        Peter Jeremy                    <[email protected]>
        Phil Wood                       <[email protected]>
        Rafal Maszkowski                <[email protected]>
+       Raphael Raimbault               <[email protected]>
        Rick Jones                      <[email protected]>
        Rick Watson                     <[email protected]>
        Rob Braun                       <[email protected]>

diff --git a/tcpdump.c b/tcpdump.c
index 106410a174aabb131d3c4432a8b3be85a2d7495f..3f175c28fa15f5d082f82748aff1c16aa445d0ea 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] _U_ =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.216.2.11 2004-04-06 13:04:54 risso Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.216.2.12 2004-06-15 00:01:52 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -615,7 +615,7 @@ main(int argc, char **argv)
                        /* NOTREACHED */
                }
 
-       if (tflag > 0)
+       if (tflag > 0 || tflag == -3)
                thiszone = gmt2local(0);
 
        if (RFileName != NULL) {