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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3.x to 3.3.11

Location:

branches/samba-3.3.x/source/libsmb

Files:

• clirap.c (modified) (7 diffs)
• libsmb_context.c (modified) (6 diffs)
• libsmb_dir.c (modified) (1 diff)
• libsmb_path.c (modified) (1 diff)
• libsmb_setget.c (modified) (3 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);
                         }

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

@@ -193 +193 @@
         
         /* Things we have to clean up */
-        free(smbc_getWorkgroup(context));
         smbc_setWorkgroup(context, NULL);
-
-        free(smbc_getNetbiosName(context));
         smbc_setNetbiosName(context, NULL);
-
-        free(smbc_getUser(context));
         smbc_setUser(context, NULL);
         
@@ -424 +419 @@
 {
         int pid;
-        char *user = NULL;
         char *home = NULL;
         
@@ -533 +527 @@
                  * FIXME: Is this the best way to get the user info?
                  */
-                user = getenv("USER");
+                char *user = getenv("USER");
                 /* walk around as "guest" if no username can be found */
                 if (!user) {
@@ -547 +541 @@
 
                 smbc_setUser(context, user);
+                SAFE_FREE(user);
+
+                if (!smbc_getUser(context)) {
+                        errno = ENOMEM;
+                        return NULL;
+                }
         }
         
@@ -579 +579 @@
                 
                 smbc_setNetbiosName(context, netbios_name);
+                SAFE_FREE(netbios_name);
+
+                if (!smbc_getNetbiosName(context)) {
+                        errno = ENOMEM;
+                        return NULL;
+                }
         }
         
@@ -600 +606 @@
 
                 smbc_setWorkgroup(context, workgroup);
+                SAFE_FREE(workgroup);
+
+                if (!smbc_getWorkgroup(context)) {
+                        errno = ENOMEM;
+                        return NULL;
+                }
         }
         

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

@@ -304 +304 @@
 
         /* For each returned entry... */
-        for (i = 0; i < total_entries; i++) {
+        for (i = 0; i < info_ctr.ctr.ctr1->count; i++) {
 
                 /* pull out the share name */

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

@@ -309 +309 @@
                         return -1;
                 }
-                *pp_server[wl] = '\0';
+                (*pp_server)[wl] = '\0';
                 return 0;
         }

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

@@ -40 +40 @@
 smbc_setNetbiosName(SMBCCTX *c, char * netbios_name)
 {
-        c->netbios_name = netbios_name;
+        SAFE_FREE(c->netbios_name);
+        if (netbios_name) {
+                c->netbios_name = SMB_STRDUP(netbios_name);
+        }
 }
 
@@ -54 +57 @@
 smbc_setWorkgroup(SMBCCTX *c, char * workgroup)
 {
-        c->workgroup = workgroup;
+        SAFE_FREE(c->workgroup);
+        if (workgroup) {
+                c->workgroup = SMB_STRDUP(workgroup);
+        }
 }
 
@@ -68 +74 @@
 smbc_setUser(SMBCCTX *c, char * user)
 {
-        c->user = user;
+        SAFE_FREE(c->user);
+        if (user) {
+                c->user = SMB_STRDUP(user);
+        }
 }