Some minor bugfixes for netlogon

[obnox/wireshark/wip.git] / packet-ucp.c

diff --git a/packet-ucp.c b/packet-ucp.c
index ff5b9ed4484601f5315a95893ec9cc50edc79778..aa2f6b111358eed822ad29361283758efd69b166 100644 (file)
--- a/packet-ucp.c
+++ b/packet-ucp.c
@@ -2,7 +2,7 @@
  * Routines for Universal Computer Protocol dissection
  * Copyright 2001, Tom Uijldert <tom.uijldert@cmg.nl>
  *
- * $Id: packet-ucp.c,v 1.9 2001/12/17 23:17:34 guy Exp $
+ * $Id: packet-ucp.c,v 1.14 2002/03/10 03:07:16 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -54,7 +54,7 @@
 # include "snprintf.h"
 #endif
 
-#include "packet.h"
+#include <epan/packet.h>
 /* #include "packet-ucp.h" */                  /* We autoregister      */
 
 /* Prototypes  */
@@ -681,6 +681,7 @@ ucp_mktime(char *datestr)
     r_time.tm_min  = 10 * (datestr[8] - '0') + (datestr[9] - '0');
     if (datestr[10])
        r_time.tm_sec  = 10 * (datestr[10] - '0') + (datestr[11] - '0');
+    r_time.tm_isdst = -1;
     return mktime(&r_time);
 }
 
@@ -1612,8 +1613,7 @@ dissect_ucp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if (tree) {
 
        /* create display subtree for the protocol */
-       ti = proto_tree_add_item(tree, proto_ucp, tvb, 0,
-                                tvb_length(tvb), FALSE);
+       ti = proto_tree_add_item(tree, proto_ucp, tvb, 0, -1, FALSE);
 
        ucp_tree = proto_item_add_subtree(ti, ett_ucp);
        /*
@@ -2101,7 +2101,7 @@ proto_register_ucp(void)
        },
        { &hf_ucp_parm_NT,
            { "NT", "ucp.parm.NT",
-             FT_STRING, BASE_NONE, NULL, 0x00,
+             FT_UINT8, BASE_DEC, VALS(vals_parm_NT), 0x00,
              "Notification type.",
              HFILL
            }