Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / print-smb.c

diff --git a/print-smb.c b/print-smb.c
index c686245c0b6e2191d26efb2c7a4fb21c7fd0172c..f5be9ffc4428f7279a3a7e3b29ba60c9a0b0ebd3 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -793,10 +793,10 @@ static void
 print_smb(netdissect_options *ndo,
           const u_char *buf, const u_char *maxbuf)
 {
 print_smb(netdissect_options *ndo,
           const u_char *buf, const u_char *maxbuf)
 {

-    u_int16_t flags2;
+    uint16_t flags2;

     int nterrcodes;
     int command;
     int nterrcodes;
     int command;

-    u_int32_t nterror;
+    uint32_t nterror;

     const u_char *words, *maxwords, *data;
     const struct smbfns *fn;
     const char *fmt_smbheader =
     const u_char *words, *maxwords, *data;
     const struct smbfns *fn;
     const char *fmt_smbheader =


@@ -1255,14 +1255,15 @@ smb_tcp_print(netdissect_options *ndo,
     if (smb_len >= 4 && caplen >= 4 && memcmp(data,"\377SMB",4) == 0) {
        if ((int)smb_len > caplen) {
            if ((int)smb_len > length)
     if (smb_len >= 4 && caplen >= 4 && memcmp(data,"\377SMB",4) == 0) {
        if ((int)smb_len > caplen) {
            if ((int)smb_len > length)

-               ND_PRINT((ndo, "WARNING: Packet is continued in later TCP segments\n"));
+               ND_PRINT((ndo, " WARNING: Packet is continued in later TCP segments\n"));

            else
            else

-               ND_PRINT((ndo, "WARNING: Short packet. Try increasing the snap length by %d\n",
+               ND_PRINT((ndo, " WARNING: Short packet. Try increasing the snap length by %d\n",

                    smb_len - caplen));
                    smb_len - caplen));

-       }
+       } else
+           ND_PRINT((ndo, " "));

        print_smb(ndo, data, maxbuf > data + smb_len ? data + smb_len : maxbuf);
     } else
        print_smb(ndo, data, maxbuf > data + smb_len ? data + smb_len : maxbuf);
     } else

-       ND_PRINT((ndo, "SMB-over-TCP packet:(raw data or continuation?)\n"));
+       ND_PRINT((ndo, " SMB-over-TCP packet:(raw data or continuation?)\n"));

     return;
 trunc:
     ND_PRINT((ndo, "%s", tstr));
     return;
 trunc:
     ND_PRINT((ndo, "%s", tstr));