Fix the overwriting of errno before use in a DEBUG statement and use the return value...

[samba.git] / source3 / modules / onefs_streams.c

diff --git a/source3/modules/onefs_streams.c b/source3/modules/onefs_streams.c
index fa65b519966136515e6412d621e1036d927cec09..0a1d98c809a9e2e53eb4e13cea1dbed1e7c7a24c 100644 (file)
--- a/source3/modules/onefs_streams.c
+++ b/source3/modules/onefs_streams.c
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "onefs.h"
 #include "onefs_config.h"
 
@@ -55,7 +56,7 @@ NTSTATUS onefs_stream_prep_smb_fname(TALLOC_CTX *ctx,
                /* Strip off the :$DATA if one exists. */
                str_tmp = strrchr_m(stream_name, ':');
                if (str_tmp) {
-                       if (StrCaseCmp(str_tmp, ":$DATA") != 0) {
+                       if (strcasecmp_m(str_tmp, ":$DATA") != 0) {
                                return NT_STATUS_INVALID_PARAMETER;
                        }
                        str_tmp[0] = '\0';
@@ -546,12 +547,12 @@ struct streaminfo_state {
 
 static bool add_one_stream(TALLOC_CTX *mem_ctx, unsigned int *num_streams,
                           struct stream_struct **streams,
-                          const char *name, SMB_OFF_T size,
-                          SMB_OFF_T alloc_size)
+                          const char *name, off_t size,
+                          off_t alloc_size)
 {
        struct stream_struct *tmp;
 
-       tmp = TALLOC_REALLOC_ARRAY(mem_ctx, *streams, struct stream_struct,
+       tmp = talloc_realloc(mem_ctx, *streams, struct stream_struct,
                                   (*num_streams)+1);
        if (tmp == NULL) {
                return false;
@@ -582,8 +583,8 @@ static NTSTATUS walk_onefs_streams(connection_struct *conn, files_struct *fsp,
        int dir_fd = -1;
        int stream_fd = -1;
        int ret;
-       SMB_STRUCT_DIR *dirp = NULL;
-       SMB_STRUCT_DIRENT *dp = NULL;
+       DIR *dirp = NULL;
+       struct dirent *dp = NULL;
        files_struct fake_fs;
        struct fd_handle fake_fh;
        SMB_STRUCT_STAT stream_sbuf;
@@ -735,25 +736,14 @@ NTSTATUS onefs_streaminfo(vfs_handle_struct *handle,
                return map_nt_error_from_unix(errno);
        }
 
-       state.streams = NULL;
-       state.num_streams = 0;
+       state.streams = *pstreams;
+       state.num_streams = *pnum_streams;
 
        if (lp_parm_bool(SNUM(handle->conn), PARM_ONEFS_TYPE,
                PARM_IGNORE_STREAMS, PARM_IGNORE_STREAMS_DEFAULT)) {
                goto out;
        }
 
-       /* Add the default stream. */
-       if (S_ISREG(sbuf.st_ex_mode)) {
-               if (!add_one_stream(mem_ctx,
-                                   &state.num_streams, &state.streams,
-                                   "", sbuf.st_ex_size,
-                                   SMB_VFS_GET_ALLOC_SIZE(handle->conn, fsp,
-                                                          &sbuf))) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-       }
-
        state.mem_ctx = mem_ctx;
        state.handle = handle;
        state.status = NT_STATUS_OK;
@@ -777,5 +767,5 @@ NTSTATUS onefs_streaminfo(vfs_handle_struct *handle,
  out:
        *num_streams = state.num_streams;
        *streams = state.streams;
-       return NT_STATUS_OK;
+       return SMB_VFS_NEXT_STREAMINFO(handle, fsp, fname, mem_ctx, pnum_streams, pstreams);
 }