- fix a bug handling readraw packets that caused the timeout to be 30

[kai/samba.git] / source3 / smbd / ipc.c

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 9da7c993dd1da1150a94fb907e1cd3e920f0db47..dd9b9661ae8e99cc424bd72d53cd87903da8c7fe 100644 (file)
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -60,7 +60,7 @@ extern fstring local_machine;
 #define QNLEN 12               /* queue name maximum length */
 
 #define MAJOR_VERSION 4
-#define MINOR_VERSION 0
+#define MINOR_VERSION 1
 
 extern int Client;
 
@@ -1666,8 +1666,7 @@ static BOOL api_RNetServerGetInfo(int cnum,int uid, char *param,char *data,
       struct srv_info_struct *servers=NULL;
       int i,count;
       pstring comment;
-      uint32 servertype=SV_TYPE_SERVER_UNIX|SV_TYPE_WORKSTATION|
-       SV_TYPE_SERVER|SV_TYPE_TIME_SOURCE;
+      uint32 servertype=DFLT_SERVER_TYPE;
 
       strcpy(comment,lp_serverstring());
 
@@ -2824,7 +2823,7 @@ int reply_trans(char *inbuf,char *outbuf)
     {
       int pcnt,poff,dcnt,doff,pdisp,ddisp;
       
-      if (!receive_smb(Client,inbuf, SMB_SECONDARY_WAIT*1000) ||
+      if (!receive_smb(Client,inbuf, SMB_SECONDARY_WAIT) ||
          CVAL(inbuf, smb_com) != SMBtrans)
        {
          DEBUG(2,("Invalid secondary trans2 packet\n"));