Changeset 745 for trunk/server/source4/ntvfs/simple

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/ntvfs/simple/svfs_util.c (modified) (4 diffs)
• source4/ntvfs/simple/vfs_simple.c (modified) (4 diffs)

trunk/server/source4/ntvfs/simple/svfs_util.c

@@ -64 +64 @@
         DIR *odir;
         struct dirent *dent;
-        uint_t allocated = 0;
+        unsigned int allocated = 0;
         char *low_mask;
 
@@ -91 +91 @@
 
         while ((dent = readdir(odir))) {
-                uint_t i = dir->count;
+                unsigned int i = dir->count;
                 char *full_name;
                 char *low_name;
@@ -121 +121 @@
                 if (!dir->files[i].name) { continue; }
 
-                asprintf(&full_name, "%s/%s", dir->unix_dir, dir->files[i].name);
+                full_name = talloc_asprintf(mem_ctx, "%s/%s", dir->unix_dir,
+                                            dir->files[i].name);
                 if (!full_name) { continue; }
 
@@ -128 +129 @@
                 }
 
-                free(full_name); 
+                talloc_free(full_name);
         }
 

trunk/server/source4/ntvfs/simple/vfs_simple.c

@@ -71 +71 @@
 
         if (strncmp(sharename, "\\\\", 2) == 0) {
-                char *p = strchr(sharename+2, '\\');
-                if (p) {
-                        sharename = p + 1;
+                char *p2 = strchr(sharename+2, '\\');
+                if (p2) {
+                        sharename = p2 + 1;
                 }
         }
@@ -834 +834 @@
         fs->generic.out.fs_type = talloc_strdup(req, "NTFS");
         fs->generic.out.volume_name = talloc_strdup(req, 
-                                                    lp_servicename(req->tcon->service));
+                                                    lpcfg_servicename(req->tcon->service));
 
         return NT_STATUS_OK;
@@ -862 +862 @@
         struct search_state *search;
         union smb_search_data file;
-        uint_t max_count;
+        unsigned int max_count;
 
         if (io->generic.level != RAW_SEARCH_TRANS2) {
@@ -936 +936 @@
         struct search_state *search;
         union smb_search_data file;
-        uint_t max_count;
+        unsigned int max_count;
 
         if (io->generic.level != RAW_SEARCH_TRANS2) {