Changeset 472 for branches/client-1.6/src/smbwrp.c

Timestamp:

Jul 2, 2010, 2:38:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 1.6: working dll

File:

• branches/client-1.6/src/smbwrp.c (modified) (8 diffs)

branches/client-1.6/src/smbwrp.c

@@ -1085 +1085 @@
 ****************************************************************************/
 // YD from libsmb\clilist.c
-// @todo 
-// in the longrun we should switch to file_info struct instead of our own smbwrp_fileinfo
-
+// @todo who frees fname, as clistr_pull_talloc allocs it
 static size_t _os2_interpret_long_filename(TALLOC_CTX *ctx, struct cli_state *cli,
                                    int level,const char *p, const char *pdata_end, smbwrp_fileinfo *finfo,
@@ -1095 +1093 @@
         const char *base = p;
         size_t ret;
+        char *fname;
         
         data_blob_free(p_last_name_raw);
@@ -1102 +1101 @@
         }
 
-//      ZERO_STRUCTP(finfo);
+        ZERO_STRUCTP(finfo);
         debuglocal(9,"fname %s (serverzone %d, level %d)\n",finfo->fname, cli->serverzone, level);
         
@@ -1139 +1138 @@
                            between win2000 and win9x for this call
                            (tridge) */
-                        ret = clistr_pull_talloc(ctx, cli, &finfo->fname, p,
+                        ret = clistr_pull_talloc(ctx, cli, &fname, p,
                                          len+2,
                                          STR_TERMINATE);
@@ -1147 +1146 @@
                         p += ret;
                         finfo->easize = -1;
+                        strncpy(finfo->fname, fname, sizeof(finfo->fname) -1);
                         return PTR_DIFF(p, base);
 
@@ -1167 +1167 @@
                                 return pdata_end - base;
                         }
-                        ret = clistr_pull_talloc(ctx, cli, &finfo->fname, p,
+                        ret = clistr_pull_talloc(ctx, cli, &fname, p,
                                          len, 
                                          STR_NOALIGN);
@@ -1174 +1174 @@
                         }
                         p += ret;
+                        strncpy(finfo->fname, fname, sizeof(finfo->fname) -1);
                         return PTR_DIFF(p, base) + 1;
                         
@@ -1229 +1230 @@
                                 return pdata_end - base;
                         }         
-                        ret = clistr_pull_talloc(ctx, cli, &finfo->fname, p,
+                        ret = clistr_pull_talloc(ctx, cli, &fname, p,
                                     namelen, 0);
                         if (ret == (size_t)-1) {
                                 return pdata_end - base;
                         }
-
+                        strncpy(finfo->fname, fname, sizeof(finfo->fname) -1);
                         /* To be robust in the face of unicode conversion failures
                            we need to copy the raw bytes of the last name seen here.