Changeset 411 for branches/samba-3.3.x/source/libsmb/clirap.c

Timestamp:

Mar 1, 2010, 3:05:48 PM (15 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3.x to 3.3.11

File:

• branches/samba-3.3.x/source/libsmb/clirap.c (modified) (7 diffs)

branches/samba-3.3.x/source/libsmb/clirap.c

@@ -271 +271 @@
                 SIVAL(p,0,func); /* api number */
                 p += 2;
-                /* Next time through we need to use the continue api */
-                func = RAP_NetServerEnum3;
-
-                if (last_entry) {
-                        strlcpy(p,"WrLehDOz", sizeof(param)-PTR_DIFF(p,param));
+
+                if (func == RAP_NetServerEnum3) {
+                        strlcpy(p,"WrLehDzz", sizeof(param)-PTR_DIFF(p,param));
                 } else {
                         strlcpy(p,"WrLehDz", sizeof(param)-PTR_DIFF(p,param));
@@ -294 +292 @@
                  */
                 len = push_ascii(p,
-                                last_entry ? last_entry : workgroup,
+                                workgroup,
                                 sizeof(param) - PTR_DIFF(p,param) - 1,
                                 STR_TERMINATE|STR_UPPER);
@@ -303 +301 @@
                 }
                 p += len;
+
+                if (func == RAP_NetServerEnum3) {
+                        len = push_ascii(p,
+                                        last_entry ? last_entry : "",
+                                        sizeof(param) - PTR_DIFF(p,param) - 1,
+                                        STR_TERMINATE);
+
+                        if (len == (size_t)-1) {
+                                SAFE_FREE(last_entry);
+                                return false;
+                        }
+                        p += len;
+                }
+
+                /* Next time through we need to use the continue api */
+                func = RAP_NetServerEnum3;
 
                 if (!cli_api(cli,
@@ -365 +379 @@
                                 char *s1, *s2;
                                 TALLOC_CTX *frame = talloc_stackframe();
+                                uint32_t entry_stype;
 
                                 if (p + 26 > rdata_end) {
@@ -375 +390 @@
                                 cmnt = comment_offset?(rdata+comment_offset):"";
 
-                                if (comment_offset < 0 || comment_offset > (int)rdrcnt) {
+                                if (comment_offset < 0 || comment_offset >= (int)rdrcnt) {
                                         TALLOC_FREE(frame);
                                         continue;
@@ -388 +403 @@
                                 }
 
-                                stype = IVAL(p,18) & ~SV_TYPE_LOCAL_LIST_ONLY;
+                                entry_stype = IVAL(p,18) & ~SV_TYPE_LOCAL_LIST_ONLY;
 
                                 pull_string_talloc(frame,rdata,0,
@@ -400 +415 @@
                                 }
 
-                                fn(s1, stype, s2, state);
+                                fn(s1, entry_stype, s2, state);
                                 TALLOC_FREE(frame);
                         }