Changeset 988 for vendor/current/source4/ntvfs/simple

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source4/ntvfs/simple

Files:

• svfs_util.c (modified) (3 diffs)
• vfs_simple.c (modified) (20 diffs)

vendor/current/source4/ntvfs/simple/svfs_util.c

@@ -39 +39 @@
         struct svfs_private *p = ntvfs->private_data;
         char *ret;
+        char *name_lower = strlower_talloc(p, name);
 
         if (*name != '\\') {
-                ret = talloc_asprintf(req, "%s/%s", p->connectpath, name);
+                ret = talloc_asprintf(req, "%s/%s", p->connectpath, name_lower);
         } else {
-                ret = talloc_asprintf(req, "%s%s", p->connectpath, name);
+                ret = talloc_asprintf(req, "%s%s", p->connectpath, name_lower);
         }
         all_string_sub(ret, "\\", "/", 0);
-
-        strlower(ret + strlen(p->connectpath));
-
+        talloc_free(name_lower);
         return ret;
 }
@@ -83 +82 @@
         mask = p+1;
 
-        low_mask = talloc_strdup(mem_ctx, mask);
+        low_mask = strlower_talloc(mem_ctx, mask);
         if (!low_mask) { return NULL; }
-        strlower(low_mask);
 
         odir = opendir(dir->unix_dir);
@@ -100 +98 @@
                 }
 
-                low_name = talloc_strdup(mem_ctx, dent->d_name);
+                low_name = strlower_talloc(mem_ctx, dent->d_name);
                 if (!low_name) { continue; }
-                strlower(low_name);
 
                 /* check it matches the wildcard pattern */
-                if (ms_fnmatch(low_mask, low_name, PROTOCOL_NT1) != 0) {
+                if (ms_fnmatch_protocol(low_mask, low_name, PROTOCOL_NT1) != 0) {
                         continue;
                 }

vendor/current/source4/ntvfs/simple/vfs_simple.c

@@ -81 +81 @@
         p->ntvfs = ntvfs;
         p->next_search_handle = 0;
-        p->connectpath = talloc_strdup(p, share_string_option(scfg, SHARE_PATH, ""));
+        p->connectpath = share_string_option(p, scfg, SHARE_PATH, "");
         p->open_files = NULL;
         p->search = NULL;
@@ -148 +148 @@
         /* ignoring wildcards ... */
         if (unlink(unix_path) == -1) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
 
@@ -177 +177 @@
 
         if (stat(unix_path, &st) == -1) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
 
@@ -292 +292 @@
         if (stat(unix_path, &st) == -1) {
                 DEBUG(19,("svfs_qpathinfo: file %s errno=%d\n", unix_path, errno));
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
         DEBUG(19,("svfs_qpathinfo: file %s, stat done\n", unix_path));
@@ -318 +318 @@
         
         if (fstat(f->fd, &st) == -1) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
 
@@ -387 +387 @@
                         if (mkdir(unix_path, 0755) == -1) {
                                 DEBUG(9,("svfs_open: mkdir %s errno=%d\n", unix_path, errno));
-                                return map_nt_error_from_unix(errno);
+                                return map_nt_error_from_unix_common(errno);
                         }
                         break;
@@ -393 +393 @@
                         if (mkdir(unix_path, 0755) == -1 && errno != EEXIST) {
                                 DEBUG(9,("svfs_open: mkdir %s errno=%d\n", unix_path, errno));
-                                return map_nt_error_from_unix(errno);
+                                return map_nt_error_from_unix_common(errno);
                         }
                         break;
@@ -402 +402 @@
         fd = open(unix_path, flags, 0644);
         if (fd == -1) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
 
@@ -408 +408 @@
                 DEBUG(9,("svfs_open: fstat errno=%d\n", errno));
                 close(fd);
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
 
@@ -415 +415 @@
 
         f = talloc(handle, struct svfs_file);
-        NT_STATUS_HAVE_NO_MEMORY(f);
+        if (f == NULL) {
+                close(fd);
+                return NT_STATUS_NO_MEMORY;
+        }
         f->fd = fd;
         f->name = talloc_strdup(f, unix_path);
@@ -457 +460 @@
 
         if (mkdir(unix_path, 0777) == -1) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
 
@@ -476 +479 @@
 
         if (rmdir(unix_path) == -1) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
 
@@ -500 +503 @@
 
         if (rename(unix_path1, unix_path2) == -1) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
         
@@ -539 +542 @@
                     rd->readx.in.offset);
         if (ret == -1) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
 
@@ -575 +578 @@
                      wr->writex.in.offset);
         if (ret == -1) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
                 
@@ -646 +649 @@
 
         if (close(f->fd) == -1) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
 
@@ -736 +739 @@
                 if (ftruncate(f->fd, 
                               info->end_of_file_info.in.size) == -1) {
-                        return map_nt_error_from_unix(errno);
+                        return map_nt_error_from_unix_common(errno);
                 }
                 break;
@@ -782 +785 @@
                         &fs->generic.out.blocks_free, 
                         &fs->generic.out.blocks_total) == -1) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
 
@@ -822 +825 @@
 
         if (stat(p->connectpath, &st) == -1) {
-                return map_nt_error_from_unix(errno);
+                return map_nt_error_from_unix_common(errno);
         }
 
@@ -1059 +1062 @@
 
         /* fill in all the operations */
-        ops.connect = svfs_connect;
-        ops.disconnect = svfs_disconnect;
-        ops.unlink = svfs_unlink;
-        ops.chkpath = svfs_chkpath;
-        ops.qpathinfo = svfs_qpathinfo;
-        ops.setpathinfo = svfs_setpathinfo;
-        ops.open = svfs_open;
-        ops.mkdir = svfs_mkdir;
-        ops.rmdir = svfs_rmdir;
-        ops.rename = svfs_rename;
-        ops.copy = svfs_copy;
-        ops.ioctl = svfs_ioctl;
-        ops.read = svfs_read;
-        ops.write = svfs_write;
-        ops.seek = svfs_seek;
-        ops.flush = svfs_flush; 
-        ops.close = svfs_close;
-        ops.exit = svfs_exit;
-        ops.lock = svfs_lock;
-        ops.setfileinfo = svfs_setfileinfo;
-        ops.qfileinfo = svfs_qfileinfo;
-        ops.fsinfo = svfs_fsinfo;
-        ops.lpq = svfs_lpq;
-        ops.search_first = svfs_search_first;
-        ops.search_next = svfs_search_next;
-        ops.search_close = svfs_search_close;
-        ops.trans = svfs_trans;
-        ops.logoff = svfs_logoff;
-        ops.async_setup = svfs_async_setup;
-        ops.cancel = svfs_cancel;
+        ops.connect_fn = svfs_connect;
+        ops.disconnect_fn = svfs_disconnect;
+        ops.unlink_fn = svfs_unlink;
+        ops.chkpath_fn = svfs_chkpath;
+        ops.qpathinfo_fn = svfs_qpathinfo;
+        ops.setpathinfo_fn = svfs_setpathinfo;
+        ops.open_fn = svfs_open;
+        ops.mkdir_fn = svfs_mkdir;
+        ops.rmdir_fn = svfs_rmdir;
+        ops.rename_fn = svfs_rename;
+        ops.copy_fn = svfs_copy;
+        ops.ioctl_fn = svfs_ioctl;
+        ops.read_fn = svfs_read;
+        ops.write_fn = svfs_write;
+        ops.seek_fn = svfs_seek;
+        ops.flush_fn = svfs_flush;
+        ops.close_fn = svfs_close;
+        ops.exit_fn = svfs_exit;
+        ops.lock_fn = svfs_lock;
+        ops.setfileinfo_fn = svfs_setfileinfo;
+        ops.qfileinfo_fn = svfs_qfileinfo;
+        ops.fsinfo_fn = svfs_fsinfo;
+        ops.lpq_fn = svfs_lpq;
+        ops.search_first_fn = svfs_search_first;
+        ops.search_next_fn = svfs_search_next;
+        ops.search_close_fn = svfs_search_close;
+        ops.trans_fn = svfs_trans;
+        ops.logoff_fn = svfs_logoff;
+        ops.async_setup_fn = svfs_async_setup;
+        ops.cancel_fn = svfs_cancel;
 
         /* register ourselves with the NTVFS subsystem. We register