Patch sent to Debian by Roderick Schertler <[email protected]> to print

the time zone offset as a signed 32-bit integer (as RFC 1533 says it is)
rather than as an unsigned 32-bit integer.

diff --git a/CREDITS b/CREDITS
index 91924a0ceb4da8a6fba443a16839809fb0f55e51..89065b69b9888cdc257a7d0d9e7bcd45d74bc37a 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -37,6 +37,7 @@ Additional people who have contributed patches:
        Rafal Maszkowski                <[email protected]>
        Richard Sharpe                  <[email protected]>
        Rick Jones                      <[email protected]>
+       Roderick Schertler              <[email protected]>
        Tony Li                         <[email protected]>
 
 The original LBL crew:

diff --git a/print-bootp.c b/print-bootp.c
index adbf015bf6a1f45b95d75437b0842df04ee0f912..531ca84b8126075617cd09dd86a01cfd8fadb1ad 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -22,7 +22,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.52 2000-09-28 06:42:56 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.53 2000-10-27 23:26:30 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -188,7 +188,7 @@ static struct tok tag2str[] = {
 /* RFC1048 tags */
        { TAG_PAD,              " PAD" },
        { TAG_SUBNET_MASK,      "iSM" },        /* subnet mask (RFC950) */
-       { TAG_TIME_OFFSET,      "lTZ" },        /* seconds from UTC */
+       { TAG_TIME_OFFSET,      "LTZ" },        /* seconds from UTC */
        { TAG_GATEWAY,          "iDG" },        /* default gateway */
        { TAG_TIME_SERVER,      "iTS" },        /* time servers (RFC868) */
        { TAG_NAME_SERVER,      "iIEN" },       /* IEN name servers (IEN116) */
@@ -359,6 +359,7 @@ rfc1048_print(register const u_char *bp, register u_int length)
 
                case 'i':
                case 'l':
+               case 'L':
                        /* ip addresses/32-bit words */
                        while (size >= sizeof(ul)) {
                                if (!first)
@@ -366,6 +367,8 @@ rfc1048_print(register const u_char *bp, register u_int length)
                                memcpy((char *)&ul, (char *)bp, sizeof(ul));
                                if (c == 'i')
                                        printf("%s", ipaddr_string(&ul));
+                               else if (c == 'L')
+                                       printf("%d", ul);
                                else
                                        printf("%u", ul);
                                bp += sizeof(ul);