Get "udp.h" from the tcpdump source tree, not from a system header file.

[tcpdump] / smbutil.c

diff --git a/smbutil.c b/smbutil.c
index 14e5c1db6206473fdbfc5f22eaccdef31a9c821c..a816ad11c28692931afb52d9de1dfc01dcdb23ed 100644 (file)
--- a/smbutil.c
+++ b/smbutil.c
@@ -11,7 +11,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.5 2000-01-09 21:34:20 fenner Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/smbutil.c,v 1.11 2000-09-28 06:43:09 guy Exp $";
 #endif
 
 #include <sys/param.h>
@@ -19,15 +19,14 @@ static const char rcsid[] =
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
 
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "interface.h"
 #include "smb.h"
@@ -525,7 +524,7 @@ const uchar *fdata(const uchar *buf, const char *fmt, const uchar *maxbuf)
     case '[':
       fmt++;
       if (buf>=maxbuf) return(buf);
-      bzero(s,sizeof(s));
+      memset(s, 0, sizeof(s));
       p = strchr(fmt,']');
       strncpy(s,fmt,p-fmt);
       fmt = p+1;
@@ -680,17 +679,17 @@ char *smb_errstr(int class,int num)
            for (j=0;err[j].name;j++)
              if (num == err[j].code)
                {
-                 sprintf(ret,"%s - %s (%s)",err_classes[i].class,
+                 snprintf(ret,sizeof(ret),"%s - %s (%s)",err_classes[i].class,
                          err[j].name,err[j].message);
                  return ret;
                }
          }
 
-       sprintf(ret,"%s - %d",err_classes[i].class,num);
+       snprintf(ret,sizeof(ret),"%s - %d",err_classes[i].class,num);
        return ret;
       }
   
-  sprintf(ret,"ERROR: Unknown error (%d,%d)",class,num);
+  snprintf(ret,sizeof(ret),"ERROR: Unknown error (%d,%d)",class,num);
   return(ret);
 }