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 93debe218740878cf19064d501395ae53dbde7f3..53fdaf2bc180b399008dd21632c276d791b3157b 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -100,6 +100,7 @@ Additional people who have contributed patches:
        Peter Jeremy                    <[email protected]>
        Phil Wood                       <[email protected]>
        Rafal Maszkowski                <[email protected]>
        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]>
        Rick Jones                      <[email protected]>
        Rick Watson                     <[email protected]>
        Rob Braun                       <[email protected]>

diff --git a/tcpdump.c b/tcpdump.c
index 44032842e5da88c8b73bf189e50e64e604befd88..04f0979ded79d22406c93c9d629b2c3dcb387d11 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_ =
     "@(#) 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.242 2004-04-07 08:14:10 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.243 2004-06-15 00:00:04 guy Exp $ (LBL)";

 #endif
 
 /*
 #endif
 
 /*


@@ -741,7 +741,7 @@ main(int argc, char **argv)
                        /* NOTREACHED */
                }
 
                        /* NOTREACHED */
                }
 

-       if (tflag > 0)
+       if (tflag > 0 || tflag == -3)

                thiszone = gmt2local(0);
 
 #ifdef WITH_CHROOT
                thiszone = gmt2local(0);
 
 #ifdef WITH_CHROOT