[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=42688

User: gerald
Date: 2012/05/17 02:09 PM

Log:
 Copy over r41781 with manual intervention:
 
   ------------------------------------------------------------------------
   r41937 | guy | 2012-04-04 12:13:39 -0700 (Wed, 04 Apr 2012) | 6 lines
   Changed paths:
      M /trunk/dumpcap.c
 
   Work around WinPcap bug wherein pcap_open() returns -1 without putting
   an error message into errbuf (the bug has been reported to
   winpcap-bugs).
 
   Should fix bug 6922.
   ------------------------------------------------------------------------
   r41995 | cmaynard | 2012-04-09 11:22:05 -0700 (Mon, 09 Apr 2012) | 2 lines
   Changed paths:
      M /trunk-1.6/epan/dissectors/packet-ip.c
 
   Set the minimum length of the Internet Timestamp option to 4 bytes instead of 5.  RFC 791 only states that the smallest legal value of the pointer is 5, not the smallest size for the option itself.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7043
   ------------------------------------------------------------------------
   r42108 | pascal | 2012-04-17 05:44:04 -0700 (Tue, 17 Apr 2012) | 5 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-dns.c
 
   From Bertho Stultiens:
   Use certificate values from RFC 4398
   From me: rename fields according to RFC and update references to RFC
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7130
   ------------------------------------------------------------------------
   r42388 | cmaynard | 2012-05-02 13:37:59 -0700 (Wed, 02 May 2012) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-radius.c
 
   Properly decrypt user-password according to http://tools.ietf.org/html/rfc2865#section-5.2
   This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6779
   #BACKPORT
   ------------------------------------------------------------------------
   r42144 | guy | 2012-04-19 16:19:10 -0700 (Thu, 19 Apr 2012) | 2 lines
   Changed paths:
      M /trunk/wiretap/csids.c
 
   Don't byte-swap bytes that aren't there.
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r41938 | guy | 2012-04-04 12:26:07 -0700 (Wed, 04 Apr 2012) | 2 lines
   Changed paths:
      M /trunk/dumpcap.c
 
   Work around that WinPcap bug for another pcap_open() call.
   ------------------------------------------------------------------------
   r41941 | guy | 2012-04-04 12:46:45 -0700 (Wed, 04 Apr 2012) | 2 lines
   Changed paths:
      M /trunk/dumpcap.c
 
   Fix tpo.
   ------------------------------------------------------------------------
   r42120 | guy | 2012-04-17 19:49:37 -0700 (Tue, 17 Apr 2012) | 11 lines
   Changed paths:
      M /trunk-1.6/doc/wireshark.pod.template
      M /trunk-1.6/wiretap/5views.c
      M /trunk-1.6/wiretap/file_access.c
 
   Pick up changes from the trunk:
 
     ------------------------------------------------------------------------
     r42119 | guy | 2012-04-17 19:48:23 -0700 (Tue, 17 Apr 2012) | 6 lines
 
     If we see a 5View time-stamped header with a bad key, make sure we
     return the right error code and information string.
 
     InfoVista bought Accellent Group, and, at least according to the
     InfoVista Web site, it's "5View", not "5Views".
 
     ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path               Action
  +20 -9     packet-dns.c       Modified
  +1 -1      packet-ip.c        Modified
  +43 -37    packet-radius.c    Modified

Directory: /trunk-1.4/doc/
  Changes    Path                      Action
  +1 -1      wireshark.pod.template    Modified

Directory: /trunk-1.4/docbook/
  Changes    Path                 Action
  +65 -10    release-notes.xml    Modified

Directory: /trunk-1.4/
  Changes    Path          Action
  +24 -2     dumpcap.c     Modified

Directory: /trunk-1.4/wiretap/
  Changes    Path             Action
  +5 -1      5views.c         Modified
  +16 -6     csids.c          Modified
  +1 -1      file_access.c    Modified