client.c: Allowed client to proceed even if it gets error 234 (more data

          available) when scanning server/workgroup/share lists.
ipc.c: Removed redundent definition of ERROR_MORE_DATA (234) we already have
       ERRmoredata in smb.h
Jeremy.

diff --git a/source/client/client.c b/source/client/client.c
index 0628314f1edd0338e4fd567731a729a7e50a3335..86de850abfef04f9d54765b535da062bfc950c1e 100644 (file)
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -2948,64 +2948,67 @@ static BOOL browse_host(BOOL sort)
 
   if (cli_call_api(PIPE_LANMAN, 0,PTR_DIFF(p,param),0, 0,
              1024, BUFFER_SIZE,
-               &rprcnt,&rdrcnt,
-              param,NULL, NULL,
-              &rparam,&rdata))
-    {
-      int res = SVAL(rparam,0);
-      int converter=SVAL(rparam,2);
-      int i;
-      BOOL long_share_name=False;
+             &rprcnt,&rdrcnt,
+             param,NULL, NULL,
+             &rparam,&rdata))
+  {
+    int res = SVAL(rparam,0);
+    int converter=SVAL(rparam,2);
+    int i;
+    BOOL long_share_name=False;
       
-      if (res == 0)
-       {
-         count=SVAL(rparam,4);
-         p = rdata;
+    if (res == 0 || res == ERRmoredata)
+    {
+      count=SVAL(rparam,4);
+      p = rdata;
 
-         if (count > 0)
-           {
-             printf("\n\tSharename      Type      Comment\n");
-             printf("\t---------      ----      -------\n");
-           }
+      if (count > 0)
+      {
+        printf("\n\tSharename      Type      Comment\n");
+        printf("\t---------      ----      -------\n");
+      }
 
-         if (sort)
-           qsort(p,count,20,QSORT_CAST StrCaseCmp);
+      if (sort)
+        qsort(p,count,20,QSORT_CAST StrCaseCmp);
 
-         for (i=0;i<count;i++)
-           {
-             char *sname = p;
-             int type = SVAL(p,14);
-             int comment_offset = IVAL(p,16) & 0xFFFF;
-             fstring typestr;
-             *typestr=0;
+      for (i=0;i<count;i++)
+      {
+        char *sname = p;
+        int type = SVAL(p,14);
+        int comment_offset = IVAL(p,16) & 0xFFFF;
+        fstring typestr;
+        *typestr=0;
 
-             switch (type)
-               {
-               case STYPE_DISKTREE:
-                 fstrcpy(typestr,"Disk"); break;
-               case STYPE_PRINTQ:
-                 fstrcpy(typestr,"Printer"); break;          
-               case STYPE_DEVICE:
-                 fstrcpy(typestr,"Device"); break;
-               case STYPE_IPC:
-                 fstrcpy(typestr,"IPC"); break;      
-               }
+        switch (type)
+        {
+          case STYPE_DISKTREE:
+            fstrcpy(typestr,"Disk"); break;
+          case STYPE_PRINTQ:
+            fstrcpy(typestr,"Printer"); break;       
+          case STYPE_DEVICE:
+            fstrcpy(typestr,"Device"); break;
+          case STYPE_IPC:
+            fstrcpy(typestr,"IPC"); break;      
+        }
 
-             printf("\t%-15.15s%-10.10s%s\n",
-                    sname,
-                    typestr,
-                    comment_offset?rdata+comment_offset-converter:"");
+        printf("\t%-15.15s%-10.10s%s\n",
+               sname, typestr,
+               comment_offset?rdata+comment_offset-converter:"");
          
-             if (strlen(sname)>8) long_share_name=True;
+        if (strlen(sname)>8) long_share_name=True;
          
-             p += 20;
-           }
+        p += 20;
+      }
 
-         if (long_share_name) {
-           printf("\nNOTE: There were share names longer than 8 chars.\nOn older clients these may not be accessible or may give browsing errors\n");
-         }
-       }
+      if (long_share_name) {
+        printf("\nNOTE: There were share names longer than 8 chars.\n\
+On older clients these may not be accessible or may give browsing errors\n");
+      }
+
+      if(res == ERRmoredata)
+        printf("\nNOTE: More data was available, the list was truncated.\n");
     }
+  }
   
   if (rparam) free(rparam);
   if (rdata) free(rdata);
@@ -3115,36 +3118,38 @@ static BOOL list_servers(char *wk_grp)
 
   if (cli_call_api(PIPE_LANMAN, 0,PTR_DIFF(p+4,param),0, 0,
            8, BUFFER_SIZE - SAFETY_MARGIN,
-              &rprcnt,&rdrcnt,
-              param,NULL, NULL,
-              &rparam,&rdata))
-    {
-      int res = SVAL(rparam,0);
-      int converter=SVAL(rparam,2);
-      int i;
-
-      if (res == 0) {  
-       char *p2 = rdata;
-       count=SVAL(rparam,4);
-
-       if (count > 0) {
-         printf("\n\nThis machine has a browse list:\n");
-         printf("\n\tServer               Comment\n");
-         printf("\t---------            -------\n");
-       }
+           &rprcnt,&rdrcnt,
+           param,NULL, NULL,
+           &rparam,&rdata))
+  {
+    int res = SVAL(rparam,0);
+    int converter=SVAL(rparam,2);
+    int i;
+
+    if (res == 0 || res == ERRmoredata) {      
+      char *p2 = rdata;
+      count=SVAL(rparam,4);
+
+      if (count > 0) {
+        printf("\n\nThis machine has a browse list:\n");
+        printf("\n\tServer               Comment\n");
+        printf("\t---------            -------\n");
+      }
        
-       for (i=0;i<count;i++) {
-         char *sname = p2;
-         int comment_offset = IVAL(p2,22) & 0xFFFF;
-         printf("\t%-16.16s     %s\n",
-                sname,
-                comment_offset?rdata+comment_offset-converter:"");
-
-         ok=True;
-         p2 += 26;
-       }
+      for (i=0;i<count;i++) {
+        char *sname = p2;
+        int comment_offset = IVAL(p2,22) & 0xFFFF;
+        printf("\t%-16.16s     %s\n", sname,
+               comment_offset?rdata+comment_offset-converter:"");
+
+        ok=True;
+        p2 += 26;
       }
+
+      if(res == ERRmoredata)
+        printf("\nNOTE: More data was available, the list was truncated.\n");
     }
+  }
 
   if (rparam) {free(rparam); rparam = NULL;}
   if (rdata) {free(rdata); rdata = NULL;}
@@ -3154,36 +3159,38 @@ static BOOL list_servers(char *wk_grp)
 
   if (cli_call_api(PIPE_LANMAN, 0,PTR_DIFF(p+4,param),0, 0,
            8, BUFFER_SIZE - SAFETY_MARGIN,
-              &rprcnt,&rdrcnt,
-              param,NULL, NULL,
-              &rparam,&rdata))
-    {
-      int res = SVAL(rparam,0);
-      int converter=SVAL(rparam,2);
-      int i;
-
-      if (res == 0) {
-       char *p2 = rdata;
-       count=SVAL(rparam,4);
-
-       if (count > 0) {
-         printf("\n\nThis machine has a workgroup list:\n");
-         printf("\n\tWorkgroup            Master\n");
-         printf("\t---------            -------\n");
-       }
+           &rprcnt,&rdrcnt,
+           param,NULL, NULL,
+           &rparam,&rdata))
+  {
+    int res = SVAL(rparam,0);
+    int converter=SVAL(rparam,2);
+    int i;
+
+    if (res == 0 || res == ERRmoredata) {
+      char *p2 = rdata;
+      count=SVAL(rparam,4);
+
+      if (count > 0) {
+        printf("\n\nThis machine has a workgroup list:\n");
+        printf("\n\tWorkgroup            Master\n");
+        printf("\t---------            -------\n");
+      }
        
-       for (i=0;i<count;i++) {
-         char *sname = p2;
-         int comment_offset = IVAL(p2,22) & 0xFFFF;
-         printf("\t%-16.16s     %s\n",
-                sname,
-                comment_offset?rdata+comment_offset-converter:"");
+      for (i=0;i<count;i++) {
+        char *sname = p2;
+        int comment_offset = IVAL(p2,22) & 0xFFFF;
+        printf("\t%-16.16s     %s\n", sname,
+               comment_offset?rdata+comment_offset-converter:"");
          
-         ok=True;
-         p2 += 26;
-       }
+        ok=True;
+        p2 += 26;
       }
+
+      if(res == ERRmoredata)
+        printf("\nNOTE: More data was available, the list was truncated.\n");
     }
+  }
 
   if (rparam) free(rparam);
   if (rdata) free(rdata);

diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c
index 8def6d49086a9f8c20a3184d3be2d39986e0f1e4..a9e0bec3ed9fdf5b92eb6a383d4accb9927d90b7 100644 (file)
--- a/source/smbd/ipc.c
+++ b/source/smbd/ipc.c
@@ -51,7 +51,6 @@ extern fstring global_myworkgroup;
 #define NERR_JobNotFound (NERR_BASE+51)
 #define NERR_DestNotFound (NERR_BASE+52)
 #define ERROR_INVALID_LEVEL 124
-#define ERROR_MORE_DATA 234
 
 #define ACCESS_READ 0x01
 #define ACCESS_WRITE 0x02
@@ -332,7 +331,7 @@ static BOOL init_package(struct pack_desc* p, int count, int subcount)
   if (i > n) {
     p->neededlen = i;
     i = n = 0;
-    p->errcode = ERROR_MORE_DATA;
+    p->errcode = ERRmoredata;
   }
   else
     p->errcode = NERR_Success;
@@ -435,7 +434,7 @@ va_dcl
       stringused = stringneeded;
       if (stringused > p->stringlen) {
        stringused = (is_string ? p->stringlen : 0);
-       if (p->errcode == NERR_Success) p->errcode = ERROR_MORE_DATA;
+       if (p->errcode == NERR_Success) p->errcode = ERRmoredata;
       }
       if (!stringused)
        SIVAL(p->structbuf,0,0);
@@ -457,7 +456,7 @@ va_dcl
     p->usedlen += needed;
   }
   else {
-    if (p->errcode == NERR_Success) p->errcode = ERROR_MORE_DATA;
+    if (p->errcode == NERR_Success) p->errcode = ERRmoredata;
   }
   return 1;
 }
@@ -1291,7 +1290,7 @@ static BOOL api_RNetServerEnum(int cnum, uint16 vuid, char *param, char *data,
   
   *rparam_len = 8;
   *rparam = REALLOC(*rparam,*rparam_len);
-  SSVAL(*rparam,0,(missed == 0 ? NERR_Success : ERROR_MORE_DATA));
+  SSVAL(*rparam,0,(missed == 0 ? NERR_Success : ERRmoredata));
   SSVAL(*rparam,2,0);
   SSVAL(*rparam,4,counted);
   SSVAL(*rparam,6,counted+missed);
@@ -1542,7 +1541,7 @@ static BOOL api_RNetShareEnum(int cnum,uint16 vuid, char *param,char *data,
   
   *rparam_len = 8;
   *rparam = REALLOC(*rparam,*rparam_len);
-  SSVAL(*rparam,0,missed ? ERROR_MORE_DATA : NERR_Success);
+  SSVAL(*rparam,0,missed ? ERRmoredata : NERR_Success);
   SSVAL(*rparam,2,0);
   SSVAL(*rparam,4,counted);
   SSVAL(*rparam,6,total);