build: Remove SMB_STRUCT_DIR define

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 8a2c8e86c5bf626822bb670832902b4b32922765..426e7b70e259a0cbd0f4ebf79a268fa7a21629fd 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -89,34 +89,34 @@ static NTSTATUS skel_get_dfs_referrals(struct vfs_handle_struct *handle,
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 

-static SMB_STRUCT_DIR *skel_opendir(vfs_handle_struct *handle,  const char *fname, const char *mask, uint32 attr)
+static DIR *skel_opendir(vfs_handle_struct *handle,  const char *fname, const char *mask, uint32 attr)

 {
        return NULL;
 }
 
 {
        return NULL;
 }
 

-static SMB_STRUCT_DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)
+static DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)

 {
        return NULL;
 }
 
 static struct dirent *skel_readdir(vfs_handle_struct *handle,
 {
        return NULL;
 }
 
 static struct dirent *skel_readdir(vfs_handle_struct *handle,

-                                      SMB_STRUCT_DIR *dirp,
+                                      DIR *dirp,

                                       SMB_STRUCT_STAT *sbuf)
 {
        return NULL;
 }
 
                                       SMB_STRUCT_STAT *sbuf)
 {
        return NULL;
 }
 

-static void skel_seekdir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp, long offset)
+static void skel_seekdir(vfs_handle_struct *handle,  DIR *dirp, long offset)

 {
        ;
 }
 
 {
        ;
 }
 

-static long skel_telldir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
+static long skel_telldir(vfs_handle_struct *handle,  DIR *dirp)

 {
        return (long)-1;
 }
 
 {
        return (long)-1;
 }
 

-static void skel_rewind_dir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
+static void skel_rewind_dir(vfs_handle_struct *handle, DIR *dirp)

 {
        ;
 }
 {
        ;
 }


@@ -133,13 +133,13 @@ static int skel_rmdir(vfs_handle_struct *handle,  const char *path)
        return -1;
 }
 
        return -1;
 }
 

-static int skel_closedir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dir)
+static int skel_closedir(vfs_handle_struct *handle,  DIR *dir)

 {
        errno = ENOSYS;
        return -1;
 }
 
 {
        errno = ENOSYS;
        return -1;
 }
 

-static void skel_init_search_op(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
+static void skel_init_search_op(struct vfs_handle_struct *handle, DIR *dirp)

 {
        ;
 }
 {
        ;
 }

diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 2c28223214a84031fba3ecde7c5cea5be6c72507..f94719403dda33e0c1de48b5d36bc3d1187b50e9 100644 (file)
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -86,34 +86,34 @@ static NTSTATUS skel_get_dfs_referrals(struct vfs_handle_struct *handle,
        return SMB_VFS_NEXT_GET_DFS_REFERRALS(handle, r);
 }
 
        return SMB_VFS_NEXT_GET_DFS_REFERRALS(handle, r);
 }
 

-static SMB_STRUCT_DIR *skel_opendir(vfs_handle_struct *handle,  const char *fname, const char *mask, uint32 attr)
+static DIR *skel_opendir(vfs_handle_struct *handle,  const char *fname, const char *mask, uint32 attr)

 {
        return SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 }
 
 {
        return SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 }
 

-static SMB_STRUCT_DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)
+static DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)

 {
        return SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
 }
 
 static struct dirent *skel_readdir(vfs_handle_struct *handle,
 {
        return SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
 }
 
 static struct dirent *skel_readdir(vfs_handle_struct *handle,

-                                      SMB_STRUCT_DIR *dirp,
+                                      DIR *dirp,

                                       SMB_STRUCT_STAT *sbuf)
 {
        return SMB_VFS_NEXT_READDIR(handle, dirp, sbuf);
 }
 
                                       SMB_STRUCT_STAT *sbuf)
 {
        return SMB_VFS_NEXT_READDIR(handle, dirp, sbuf);
 }
 

-static void skel_seekdir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp, long offset)
+static void skel_seekdir(vfs_handle_struct *handle,  DIR *dirp, long offset)

 {
        SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset);
 }
 
 {
        SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset);
 }
 

-static long skel_telldir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
+static long skel_telldir(vfs_handle_struct *handle,  DIR *dirp)

 {
        return SMB_VFS_NEXT_TELLDIR(handle, dirp);
 }
 
 {
        return SMB_VFS_NEXT_TELLDIR(handle, dirp);
 }
 

-static void skel_rewind_dir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
+static void skel_rewind_dir(vfs_handle_struct *handle, DIR *dirp)

 {
        SMB_VFS_NEXT_REWINDDIR(handle, dirp);
 }
 {
        SMB_VFS_NEXT_REWINDDIR(handle, dirp);
 }


@@ -128,12 +128,12 @@ static int skel_rmdir(vfs_handle_struct *handle,  const char *path)
        return SMB_VFS_NEXT_RMDIR(handle, path);
 }
 
        return SMB_VFS_NEXT_RMDIR(handle, path);
 }
 

-static int skel_closedir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dir)
+static int skel_closedir(vfs_handle_struct *handle,  DIR *dir)

 {
        return SMB_VFS_NEXT_CLOSEDIR(handle, dir);
 }
 
 {
        return SMB_VFS_NEXT_CLOSEDIR(handle, dir);
 }
 

-static void skel_init_search_op(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
+static void skel_init_search_op(struct vfs_handle_struct *handle, DIR *dirp)

 {
        SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp);
 }
 {
        SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp);
 }

diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index ae16d06a94ecfec25b66d4deef8740d505b2673b..8bda729d692e8897dbdf69aebe8f993a81bc01fa 100644 (file)
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -487,7 +487,7 @@ static NTSTATUS gp_glob_ext_list(TALLOC_CTX *mem_ctx,
                                 const char ***ext_list,
                                 size_t *ext_list_len)
 {
                                 const char ***ext_list,
                                 size_t *ext_list_len)
 {

-       SMB_STRUCT_DIR *dir = NULL;
+       DIR *dir = NULL;

        struct dirent *dirent = NULL;
 
        dir = opendir(modules_path(talloc_tos(), 
        struct dirent *dirent = NULL;
 
        dir = opendir(modules_path(talloc_tos(), 

diff --git a/source3/client/client.c b/source3/client/client.c
index 40ba23ef4079866f130f797d7bf51ed04cd3fba2..3bfe8e94a7ef419f444907a9534c829af16a113b 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2074,7 +2074,7 @@ static int cmd_select(void)
 static int file_find(struct file_list **list, const char *directory,
                      const char *expression, bool match)
 {
 static int file_find(struct file_list **list, const char *directory,
                      const char *expression, bool match)
 {

-       SMB_STRUCT_DIR *dir;
+       DIR *dir;

        struct file_list *entry;
         struct stat statbuf;
         int ret;
        struct file_list *entry;
         struct stat statbuf;
         int ret;

diff --git a/source3/include/includes.h b/source3/include/includes.h
index ffdc1d28f3bce40bc52e22806fd21d571043216b..e8f3c0bb341dfc5dfc655954ae834c618a30fdab 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -367,14 +367,6 @@ struct stat_ex {
 
 typedef struct stat_ex SMB_STRUCT_STAT;
 
 
 typedef struct stat_ex SMB_STRUCT_STAT;
 

-/*
- * Type for DIR structure.
- */
-
-#ifndef SMB_STRUCT_DIR
-#    define SMB_STRUCT_DIR DIR
-#endif
-

 /*
  * Defines for 64 bit fcntl locks.
  */
 /*
  * Defines for 64 bit fcntl locks.
  */

diff --git a/source3/include/proto.h b/source3/include/proto.h
index f6db59e14e8da19ad585fa64a249790227500f61..303ea9ccb4b2ce8df49f68bae281b229b89cae3f 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -337,7 +337,7 @@ int sys_lstat(const char *fname,SMB_STRUCT_STAT *sbuf,
 int sys_posix_fallocate(int fd, SMB_OFF_T offset, SMB_OFF_T len);
 int sys_fallocate(int fd, enum vfs_fallocate_mode mode, SMB_OFF_T offset, SMB_OFF_T len);
 void kernel_flock(int fd, uint32 share_mode, uint32 access_mask);
 int sys_posix_fallocate(int fd, SMB_OFF_T offset, SMB_OFF_T len);
 int sys_fallocate(int fd, enum vfs_fallocate_mode mode, SMB_OFF_T offset, SMB_OFF_T len);
 void kernel_flock(int fd, uint32 share_mode, uint32 access_mask);

-SMB_STRUCT_DIR *sys_fdopendir(int fd);
+DIR *sys_fdopendir(int fd);

 int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev);
 int sys_waitpid(pid_t pid,int *status,int options);
 char *sys_getwd(void);
 int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev);
 int sys_waitpid(pid_t pid,int *status,int options);
 char *sys_getwd(void);


@@ -487,7 +487,7 @@ uid_t nametouid(const char *name);
 gid_t nametogid(const char *name);
 void smb_panic_s3(const char *why);
 void log_stack_trace(void);
 gid_t nametogid(const char *name);
 void smb_panic_s3(const char *why);
 void log_stack_trace(void);

-const char *readdirname(SMB_STRUCT_DIR *p);
+const char *readdirname(DIR *p);

 bool is_in_path(const char *name, name_compare_entry *namelist, bool case_sensitive);
 void set_namearray(name_compare_entry **ppname_array, const char *namelist);
 void free_namearray(name_compare_entry *name_array);
 bool is_in_path(const char *name, name_compare_entry *namelist, bool case_sensitive);
 void set_namearray(name_compare_entry **ppname_array, const char *namelist);
 void free_namearray(name_compare_entry *name_array);

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 023f5b177e8533de520677872e8d5e7db29c5c5c..585214f77b1495513998f3c877b7ceae09d9a513 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -204,18 +204,18 @@ struct vfs_fn_pointers {
 
        /* Directory operations */
 
 
        /* Directory operations */
 

-       SMB_STRUCT_DIR *(*opendir_fn)(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attributes);
-       SMB_STRUCT_DIR *(*fdopendir_fn)(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attributes);
+       DIR *(*opendir_fn)(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attributes);
+       DIR *(*fdopendir_fn)(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attributes);

        struct dirent *(*readdir_fn)(struct vfs_handle_struct *handle,
        struct dirent *(*readdir_fn)(struct vfs_handle_struct *handle,

-                                        SMB_STRUCT_DIR *dirp,
+                                        DIR *dirp,

                                         SMB_STRUCT_STAT *sbuf);
                                         SMB_STRUCT_STAT *sbuf);

-       void (*seekdir_fn)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, long offset);
-       long (*telldir_fn)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp);
-       void (*rewind_dir_fn)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp);
+       void (*seekdir_fn)(struct vfs_handle_struct *handle, DIR *dirp, long offset);
+       long (*telldir_fn)(struct vfs_handle_struct *handle, DIR *dirp);
+       void (*rewind_dir_fn)(struct vfs_handle_struct *handle, DIR *dirp);

        int (*mkdir_fn)(struct vfs_handle_struct *handle, const char *path, mode_t mode);
        int (*rmdir_fn)(struct vfs_handle_struct *handle, const char *path);
        int (*mkdir_fn)(struct vfs_handle_struct *handle, const char *path, mode_t mode);
        int (*rmdir_fn)(struct vfs_handle_struct *handle, const char *path);

-       int (*closedir_fn)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dir);
-       void (*init_search_op_fn)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp);
+       int (*closedir_fn)(struct vfs_handle_struct *handle, DIR *dir);
+       void (*init_search_op_fn)(struct vfs_handle_struct *handle, DIR *dirp);

 
        /* File operations */
 
 
        /* File operations */
 


@@ -553,29 +553,29 @@ uint32_t smb_vfs_call_fs_capabilities(struct vfs_handle_struct *handle,
  */
 NTSTATUS smb_vfs_call_get_dfs_referrals(struct vfs_handle_struct *handle,
                                        struct dfs_GetDFSReferral *r);
  */
 NTSTATUS smb_vfs_call_get_dfs_referrals(struct vfs_handle_struct *handle,
                                        struct dfs_GetDFSReferral *r);

-SMB_STRUCT_DIR *smb_vfs_call_opendir(struct vfs_handle_struct *handle,
+DIR *smb_vfs_call_opendir(struct vfs_handle_struct *handle,

                                     const char *fname, const char *mask,
                                     uint32 attributes);
                                     const char *fname, const char *mask,
                                     uint32 attributes);

-SMB_STRUCT_DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle,
+DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle,

                                        struct files_struct *fsp,
                                        const char *mask,
                                        uint32 attributes);
 struct dirent *smb_vfs_call_readdir(struct vfs_handle_struct *handle,
                                        struct files_struct *fsp,
                                        const char *mask,
                                        uint32 attributes);
 struct dirent *smb_vfs_call_readdir(struct vfs_handle_struct *handle,

-                                       SMB_STRUCT_DIR *dirp,
+                                       DIR *dirp,

                                        SMB_STRUCT_STAT *sbuf);
 void smb_vfs_call_seekdir(struct vfs_handle_struct *handle,
                                        SMB_STRUCT_STAT *sbuf);
 void smb_vfs_call_seekdir(struct vfs_handle_struct *handle,

-                         SMB_STRUCT_DIR *dirp, long offset);
+                         DIR *dirp, long offset);

 long smb_vfs_call_telldir(struct vfs_handle_struct *handle,
 long smb_vfs_call_telldir(struct vfs_handle_struct *handle,

-                         SMB_STRUCT_DIR *dirp);
+                         DIR *dirp);

 void smb_vfs_call_rewind_dir(struct vfs_handle_struct *handle,
 void smb_vfs_call_rewind_dir(struct vfs_handle_struct *handle,

-                            SMB_STRUCT_DIR *dirp);
+                            DIR *dirp);

 int smb_vfs_call_mkdir(struct vfs_handle_struct *handle, const char *path,
                       mode_t mode);
 int smb_vfs_call_rmdir(struct vfs_handle_struct *handle, const char *path);
 int smb_vfs_call_closedir(struct vfs_handle_struct *handle,
 int smb_vfs_call_mkdir(struct vfs_handle_struct *handle, const char *path,
                       mode_t mode);
 int smb_vfs_call_rmdir(struct vfs_handle_struct *handle, const char *path);
 int smb_vfs_call_closedir(struct vfs_handle_struct *handle,

-                         SMB_STRUCT_DIR *dir);
+                         DIR *dir);

 void smb_vfs_call_init_search_op(struct vfs_handle_struct *handle,
 void smb_vfs_call_init_search_op(struct vfs_handle_struct *handle,

-                                SMB_STRUCT_DIR *dirp);
+                                DIR *dirp);

 int smb_vfs_call_open(struct vfs_handle_struct *handle,
                      struct smb_filename *smb_fname, struct files_struct *fsp,
                      int flags, mode_t mode);
 int smb_vfs_call_open(struct vfs_handle_struct *handle,
                      struct smb_filename *smb_fname, struct files_struct *fsp,
                      int flags, mode_t mode);

diff --git a/source3/lib/system.c b/source3/lib/system.c
index 1988088ba522db0af5e3e2dce11119d81aa2b256..5ba3aebd6955592ccfc955377bcdc1bd941cafc5 100644 (file)
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -623,7 +623,7 @@ void kernel_flock(int fd, uint32 share_mode, uint32 access_mask)
  calling code.. JRA.
 ********************************************************************/
 
  calling code.. JRA.
 ********************************************************************/
 

-SMB_STRUCT_DIR *sys_fdopendir(int fd)
+DIR *sys_fdopendir(int fd)

 {
 #if defined(HAVE_FDOPENDIR) && defined(HAVE_DIRFD)
        return fdopendir(fd);
 {
 #if defined(HAVE_FDOPENDIR) && defined(HAVE_DIRFD)
        return fdopendir(fd);

diff --git a/source3/lib/util.c b/source3/lib/util.c
index b727f7b3d880c30a5f97d76976ecce177c972ec7..edad75d646b6ff61446ff52b6af2ed4dc8550176 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1029,7 +1029,7 @@ libunwind_failed:
   A readdir wrapper which just returns the file name.
  ********************************************************************/
 
   A readdir wrapper which just returns the file name.
  ********************************************************************/
 

-const char *readdirname(SMB_STRUCT_DIR *p)
+const char *readdirname(DIR *p)

 {
        struct dirent *ptr;
        char *dname;
 {
        struct dirent *ptr;
        char *dname;

diff --git a/source3/modules/onefs.h b/source3/modules/onefs.h
index 926138bdabcefe38dce3d088313385161489dbc0..1f72a9f20704a0c0b7faafb1336e847208b93969 100644 (file)
--- a/source3/modules/onefs.h
+++ b/source3/modules/onefs.h
@@ -24,24 +24,24 @@
 /*
  * vfs interface handlers
  */
 /*
  * vfs interface handlers
  */

-SMB_STRUCT_DIR *onefs_opendir(struct vfs_handle_struct *handle,
+DIR *onefs_opendir(struct vfs_handle_struct *handle,

                              const char *fname, const char *mask,
                              uint32 attributes);
 
 struct dirent *onefs_readdir(struct vfs_handle_struct *handle,
                              const char *fname, const char *mask,
                              uint32 attributes);
 
 struct dirent *onefs_readdir(struct vfs_handle_struct *handle,

-                                SMB_STRUCT_DIR *dirp, SMB_STRUCT_STAT *sbuf);
+                                DIR *dirp, SMB_STRUCT_STAT *sbuf);

 
 

-void onefs_seekdir(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp,
+void onefs_seekdir(struct vfs_handle_struct *handle, DIR *dirp,

                   long offset);
 
                   long offset);
 

-long onefs_telldir(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp);
+long onefs_telldir(struct vfs_handle_struct *handle, DIR *dirp);

 
 

-void onefs_rewinddir(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp);
+void onefs_rewinddir(struct vfs_handle_struct *handle, DIR *dirp);

 
 

-int onefs_closedir(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dir);
+int onefs_closedir(struct vfs_handle_struct *handle, DIR *dir);

 
 void onefs_init_search_op(struct vfs_handle_struct *handle,
 
 void onefs_init_search_op(struct vfs_handle_struct *handle,

-                         SMB_STRUCT_DIR *dirp);
+                         DIR *dirp);

 
 NTSTATUS onefs_create_file(vfs_handle_struct *handle,
                           struct smb_request *req,
 
 NTSTATUS onefs_create_file(vfs_handle_struct *handle,
                           struct smb_request *req,


@@ -142,7 +142,7 @@ NTSTATUS onefs_stream_prep_smb_fname(TALLOC_CTX *ctx,
                                     const struct smb_filename *smb_fname_in,
                                     struct smb_filename **smb_fname_out);
 
                                     const struct smb_filename *smb_fname_in,
                                     struct smb_filename **smb_fname_out);
 

-int onefs_rdp_add_dir_state(connection_struct *conn, SMB_STRUCT_DIR *dirp);
+int onefs_rdp_add_dir_state(connection_struct *conn, DIR *dirp);

 
 /*
  * System Interfaces
 
 /*
  * System Interfaces

diff --git a/source3/modules/onefs_dir.c b/source3/modules/onefs_dir.c
index 00ea145b2c534cbaf513a97de84dac995e30a0ac..1a0f4819fe7a3967815e586a118658ed44513810 100644 (file)
--- a/source3/modules/onefs_dir.c
+++ b/source3/modules/onefs_dir.c
@@ -49,7 +49,7 @@ static uint64_t *rdp_cookies = NULL;
 
 struct rdp_dir_state {
        struct rdp_dir_state *next, *prev;
 
 struct rdp_dir_state {
        struct rdp_dir_state *next, *prev;

-       SMB_STRUCT_DIR *dirp;
+       DIR *dirp;

        char *direntries_cursor; /* cursor to last returned direntry in cache */
        size_t stat_count;       /* number of entries stored in the cache */
        size_t stat_cursor;      /* cursor to last returned stat in the cache */
        char *direntries_cursor; /* cursor to last returned direntry in cache */
        size_t stat_count;       /* number of entries stored in the cache */
        size_t stat_cursor;      /* cursor to last returned stat in the cache */


@@ -59,7 +59,7 @@ struct rdp_dir_state {
 
 static struct rdp_dir_state *dirstatelist = NULL;
 
 
 static struct rdp_dir_state *dirstatelist = NULL;
 

-SMB_STRUCT_DIR *rdp_last_dirp = NULL;
+DIR *rdp_last_dirp = NULL;

 
 /**
  * Given a DIR pointer, return our internal state.
 
 /**
  * Given a DIR pointer, return our internal state.


@@ -73,7 +73,7 @@ SMB_STRUCT_DIR *rdp_last_dirp = NULL;
  * @return 0 on success, 1 on failure
  */
 static int
  * @return 0 on success, 1 on failure
  */
 static int

-rdp_retrieve_dir_state(SMB_STRUCT_DIR *dirp, struct rdp_dir_state **dir_state,
+rdp_retrieve_dir_state(DIR *dirp, struct rdp_dir_state **dir_state,

                       bool *same_as_last)
 {
        struct rdp_dir_state *dsp;
                       bool *same_as_last)
 {
        struct rdp_dir_state *dsp;


@@ -198,7 +198,7 @@ rdp_fill_cache(struct rdp_dir_state *dsp)
  * call to VFS_CLOSEDIR().
  */
 int
  * call to VFS_CLOSEDIR().
  */
 int

-onefs_rdp_add_dir_state(connection_struct *conn, SMB_STRUCT_DIR *dirp)
+onefs_rdp_add_dir_state(connection_struct *conn, DIR *dirp)

 {
        int ret = 0;
        struct rdp_dir_state *dsp = NULL;
 {
        int ret = 0;
        struct rdp_dir_state *dsp = NULL;


@@ -225,7 +225,7 @@ onefs_rdp_add_dir_state(connection_struct *conn, SMB_STRUCT_DIR *dirp)
                return ret;
        }
 
                return ret;
        }
 

-       /* Set the SMB_STRUCT_DIR in the dsp */
+       /* Set the DIR in the dsp */

        dsp->dirp = dirp;
 
        DLIST_ADD(dirstatelist, dsp);
        dsp->dirp = dirp;
 
        DLIST_ADD(dirstatelist, dsp);


@@ -246,12 +246,12 @@ onefs_rdp_add_dir_state(connection_struct *conn, SMB_STRUCT_DIR *dirp)
  *
  * @return DIR pointer, NULL if directory does not exist, NULL on error
  */
  *
  * @return DIR pointer, NULL if directory does not exist, NULL on error
  */

-SMB_STRUCT_DIR *
+DIR *

 onefs_opendir(vfs_handle_struct *handle, const char *fname, const char *mask,
              uint32 attr)
 {
        int ret = 0;
 onefs_opendir(vfs_handle_struct *handle, const char *fname, const char *mask,
              uint32 attr)
 {
        int ret = 0;

-       SMB_STRUCT_DIR *ret_dirp;
+       DIR *ret_dirp;

 
        /* Fallback to default system routines if readdirplus is disabled */
        if (!lp_parm_bool(SNUM(handle->conn), PARM_ONEFS_TYPE,
 
        /* Fallback to default system routines if readdirplus is disabled */
        if (!lp_parm_bool(SNUM(handle->conn), PARM_ONEFS_TYPE,


@@ -297,7 +297,7 @@ onefs_opendir(vfs_handle_struct *handle, const char *fname, const char *mask,
  * @return dirent structure, NULL if at the end of the directory, NULL on error
  */
 struct dirent *
  * @return dirent structure, NULL if at the end of the directory, NULL on error
  */
 struct dirent *

-onefs_readdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp,
+onefs_readdir(vfs_handle_struct *handle, DIR *dirp,

              SMB_STRUCT_STAT *sbuf)
 {
        struct rdp_dir_state *dsp = NULL;
              SMB_STRUCT_STAT *sbuf)
 {
        struct rdp_dir_state *dsp = NULL;


@@ -320,7 +320,7 @@ onefs_readdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp,
        ret = rdp_retrieve_dir_state(dirp, &dsp, &same_as_last);
        if (ret) {
                DEBUG(1, ("Could not retrieve dir_state struct for "
        ret = rdp_retrieve_dir_state(dirp, &dsp, &same_as_last);
        if (ret) {
                DEBUG(1, ("Could not retrieve dir_state struct for "

-                        "SMB_STRUCT_DIR pointer.\n"));
+                        "DIR pointer.\n"));

                ret_direntp = NULL;
                goto end;
        }
                ret_direntp = NULL;
                goto end;
        }


@@ -405,7 +405,7 @@ end:
  * @return no return value
  */
 void
  * @return no return value
  */
 void

-onefs_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, long offset)
+onefs_seekdir(vfs_handle_struct *handle, DIR *dirp, long offset)

 {
        struct rdp_dir_state *dsp = NULL;
        bool same_as_last;
 {
        struct rdp_dir_state *dsp = NULL;
        bool same_as_last;


@@ -429,7 +429,7 @@ onefs_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, long offset)
        ret = rdp_retrieve_dir_state(dirp, &dsp, &same_as_last);
        if (ret) {
                DEBUG(1, ("Could not retrieve dir_state struct for "
        ret = rdp_retrieve_dir_state(dirp, &dsp, &same_as_last);
        if (ret) {
                DEBUG(1, ("Could not retrieve dir_state struct for "

-                        "SMB_STRUCT_DIR pointer.\n"));
+                        "DIR pointer.\n"));

                /* XXX: we can't return an error, should we ABORT rather than
                 * return without actually seeking? */
                return;
                /* XXX: we can't return an error, should we ABORT rather than
                 * return without actually seeking? */
                return;


@@ -469,7 +469,7 @@ onefs_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, long offset)
  * @return offset into the directory to resume reading from
  */
 long
  * @return offset into the directory to resume reading from
  */
 long

-onefs_telldir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
+onefs_telldir(vfs_handle_struct *handle,  DIR *dirp)

 {
        struct rdp_dir_state *dsp = NULL;
        bool same_as_last;
 {
        struct rdp_dir_state *dsp = NULL;
        bool same_as_last;


@@ -487,7 +487,7 @@ onefs_telldir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
        ret = rdp_retrieve_dir_state(dirp, &dsp, &same_as_last);
        if (ret) {
                DEBUG(1, ("Could not retrieve dir_state struct for "
        ret = rdp_retrieve_dir_state(dirp, &dsp, &same_as_last);
        if (ret) {
                DEBUG(1, ("Could not retrieve dir_state struct for "

-                        "SMB_STRUCT_DIR pointer.\n"));
+                        "DIR pointer.\n"));

                return -1;
        }
 
                return -1;
        }
 


@@ -516,7 +516,7 @@ onefs_telldir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
  * @return no return value
  */
 void
  * @return no return value
  */
 void

-onefs_rewinddir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
+onefs_rewinddir(vfs_handle_struct *handle,  DIR *dirp)

 {
        struct rdp_dir_state *dsp = NULL;
        bool same_as_last;
 {
        struct rdp_dir_state *dsp = NULL;
        bool same_as_last;


@@ -533,7 +533,7 @@ onefs_rewinddir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
        ret = rdp_retrieve_dir_state(dirp, &dsp, &same_as_last);
        if (ret) {
                DEBUG(1, ("Could not retrieve dir_state struct for "
        ret = rdp_retrieve_dir_state(dirp, &dsp, &same_as_last);
        if (ret) {
                DEBUG(1, ("Could not retrieve dir_state struct for "

-                        "SMB_STRUCT_DIR pointer.\n"));
+                        "DIR pointer.\n"));

                return;
        }
 
                return;
        }
 


@@ -560,7 +560,7 @@ onefs_rewinddir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
  * @return -1 on failure, setting errno
  */
 int
  * @return -1 on failure, setting errno
  */
 int

-onefs_closedir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
+onefs_closedir(vfs_handle_struct *handle,  DIR *dirp)

 {
        struct rdp_dir_state *dsp = NULL;
        bool same_as_last;
 {
        struct rdp_dir_state *dsp = NULL;
        bool same_as_last;


@@ -578,7 +578,7 @@ onefs_closedir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
        ret = rdp_retrieve_dir_state(dirp, &dsp, &same_as_last);
        if (ret) {
                DEBUG(1, ("Could not retrieve dir_state struct for "
        ret = rdp_retrieve_dir_state(dirp, &dsp, &same_as_last);
        if (ret) {
                DEBUG(1, ("Could not retrieve dir_state struct for "

-                        "SMB_STRUCT_DIR pointer.\n"));
+                        "DIR pointer.\n"));

                errno = ENOENT;
                return -1;
        }
                errno = ENOENT;
                return -1;
        }


@@ -612,7 +612,7 @@ onefs_closedir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
  * @return nothing
  */
 void
  * @return nothing
  */
 void

-onefs_init_search_op(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
+onefs_init_search_op(vfs_handle_struct *handle,  DIR *dirp)

 {
        /* Setting the rdp_last_dirp to NULL will cause the next readdir
         * operation to refill the cache. */
 {
        /* Setting the rdp_last_dirp to NULL will cause the next readdir
         * operation to refill the cache. */

diff --git a/source3/modules/onefs_streams.c b/source3/modules/onefs_streams.c
index 221825cdab0306063a4f2493e180531b2f818497..c79619922ca0ce5a07a4b6768af695d008339834 100644 (file)
--- a/source3/modules/onefs_streams.c
+++ b/source3/modules/onefs_streams.c
@@ -583,7 +583,7 @@ static NTSTATUS walk_onefs_streams(connection_struct *conn, files_struct *fsp,
        int dir_fd = -1;
        int stream_fd = -1;
        int ret;
        int dir_fd = -1;
        int stream_fd = -1;
        int ret;

-       SMB_STRUCT_DIR *dirp = NULL;
+       DIR *dirp = NULL;

        struct dirent *dp = NULL;
        files_struct fake_fs;
        struct fd_handle fake_fh;
        struct dirent *dp = NULL;
        files_struct fake_fs;
        struct fd_handle fake_fh;

diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c
index 1da8755410d52d1986e64c3e59d224a1a787dd81..3377b5f8490de1b046f8a9d0afc6f8f7d1b73ce9 100644 (file)
--- a/source3/modules/vfs_audit.c
+++ b/source3/modules/vfs_audit.c
@@ -106,9 +106,9 @@ static void audit_disconnect(vfs_handle_struct *handle)
        return;
 }
 
        return;
 }
 

-static SMB_STRUCT_DIR *audit_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
+static DIR *audit_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)

 {
 {

-       SMB_STRUCT_DIR *result;
+       DIR *result;

        
        result = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 
        
        result = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 

diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index e7539902bc74fd28ef7f24edadfde085eaf8d0ee..d5682720cdb921eef5651c14aa592a8a493d7ba8 100644 (file)
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -43,7 +43,7 @@ static uint64_t cap_disk_free(vfs_handle_struct *handle, const char *path,
                                        dfree, dsize);
 }
 
                                        dfree, dsize);
 }
 

-static SMB_STRUCT_DIR *cap_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
+static DIR *cap_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)

 {
        char *capname = capencode(talloc_tos(), fname);
 
 {
        char *capname = capencode(talloc_tos(), fname);
 


@@ -55,7 +55,7 @@ static SMB_STRUCT_DIR *cap_opendir(vfs_handle_struct *handle, const char *fname,
 }
 
 static struct dirent *cap_readdir(vfs_handle_struct *handle,
 }
 
 static struct dirent *cap_readdir(vfs_handle_struct *handle,

-                                     SMB_STRUCT_DIR *dirp,
+                                     DIR *dirp,

                                      SMB_STRUCT_STAT *sbuf)
 {
        struct dirent *result;
                                      SMB_STRUCT_STAT *sbuf)
 {
        struct dirent *result;

diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index d18977d6fe75085abc13a66ccdb5835f73d36aeb..5834ead2a8f11e32bc1fe695014c99a3a841e7d0 100644 (file)
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -261,14 +261,14 @@ static NTSTATUS catia_string_replace_allocate(connection_struct *conn,
        return NT_STATUS_OK;
 }
 
        return NT_STATUS_OK;
 }
 

-static SMB_STRUCT_DIR *catia_opendir(vfs_handle_struct *handle,
+static DIR *catia_opendir(vfs_handle_struct *handle,

                                     const char *fname,
                                     const char *mask,
                                     uint32 attr)
 {
        char *name_mapped = NULL;
        NTSTATUS status;
                                     const char *fname,
                                     const char *mask,
                                     uint32 attr)
 {
        char *name_mapped = NULL;
        NTSTATUS status;

-       SMB_STRUCT_DIR *ret;
+       DIR *ret;

 
        status = catia_string_replace_allocate(handle->conn, fname,
                                        &name_mapped, vfs_translate_to_unix);
 
        status = catia_string_replace_allocate(handle->conn, fname,
                                        &name_mapped, vfs_translate_to_unix);

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 1f3dd6a89b1c74a72e06604e422eb1ae37e65d76..49c948f8af399fe75dd85759e2dcffd26bb4a416 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -343,9 +343,9 @@ static NTSTATUS vfswrap_get_dfs_referrals(struct vfs_handle_struct *handle,
 
 /* Directory operations */
 
 
 /* Directory operations */
 

-static SMB_STRUCT_DIR *vfswrap_opendir(vfs_handle_struct *handle,  const char *fname, const char *mask, uint32 attr)
+static DIR *vfswrap_opendir(vfs_handle_struct *handle,  const char *fname, const char *mask, uint32 attr)

 {
 {

-       SMB_STRUCT_DIR *result;
+       DIR *result;

 
        START_PROFILE(syscall_opendir);
        result = opendir(fname);
 
        START_PROFILE(syscall_opendir);
        result = opendir(fname);


@@ -353,12 +353,12 @@ static SMB_STRUCT_DIR *vfswrap_opendir(vfs_handle_struct *handle,  const char *f
        return result;
 }
 
        return result;
 }
 

-static SMB_STRUCT_DIR *vfswrap_fdopendir(vfs_handle_struct *handle,
+static DIR *vfswrap_fdopendir(vfs_handle_struct *handle,

                        files_struct *fsp,
                        const char *mask,
                        uint32 attr)
 {
                        files_struct *fsp,
                        const char *mask,
                        uint32 attr)
 {

-       SMB_STRUCT_DIR *result;
+       DIR *result;

 
        START_PROFILE(syscall_fdopendir);
        result = sys_fdopendir(fsp->fh->fd);
 
        START_PROFILE(syscall_fdopendir);
        result = sys_fdopendir(fsp->fh->fd);


@@ -368,7 +368,7 @@ static SMB_STRUCT_DIR *vfswrap_fdopendir(vfs_handle_struct *handle,
 
 
 static struct dirent *vfswrap_readdir(vfs_handle_struct *handle,
 
 
 static struct dirent *vfswrap_readdir(vfs_handle_struct *handle,

-                                         SMB_STRUCT_DIR *dirp,
+                                         DIR *dirp,

                                          SMB_STRUCT_STAT *sbuf)
 {
        struct dirent *result;
                                          SMB_STRUCT_STAT *sbuf)
 {
        struct dirent *result;


@@ -383,14 +383,14 @@ static struct dirent *vfswrap_readdir(vfs_handle_struct *handle,
        return result;
 }
 
        return result;
 }
 

-static void vfswrap_seekdir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp, long offset)
+static void vfswrap_seekdir(vfs_handle_struct *handle,  DIR *dirp, long offset)

 {
        START_PROFILE(syscall_seekdir);
        seekdir(dirp, offset);
        END_PROFILE(syscall_seekdir);
 }
 
 {
        START_PROFILE(syscall_seekdir);
        seekdir(dirp, offset);
        END_PROFILE(syscall_seekdir);
 }
 

-static long vfswrap_telldir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
+static long vfswrap_telldir(vfs_handle_struct *handle,  DIR *dirp)

 {
        long result;
        START_PROFILE(syscall_telldir);
 {
        long result;
        START_PROFILE(syscall_telldir);


@@ -399,7 +399,7 @@ static long vfswrap_telldir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
        return result;
 }
 
        return result;
 }
 

-static void vfswrap_rewinddir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
+static void vfswrap_rewinddir(vfs_handle_struct *handle,  DIR *dirp)

 {
        START_PROFILE(syscall_rewinddir);
        rewinddir(dirp);
 {
        START_PROFILE(syscall_rewinddir);
        rewinddir(dirp);


@@ -450,7 +450,7 @@ static int vfswrap_rmdir(vfs_handle_struct *handle,  const char *path)
        return result;
 }
 
        return result;
 }
 

-static int vfswrap_closedir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
+static int vfswrap_closedir(vfs_handle_struct *handle,  DIR *dirp)

 {
        int result;
 
 {
        int result;
 


@@ -461,7 +461,7 @@ static int vfswrap_closedir(vfs_handle_struct *handle,  SMB_STRUCT_DIR *dirp)
 }
 
 static void vfswrap_init_search_op(vfs_handle_struct *handle,
 }
 
 static void vfswrap_init_search_op(vfs_handle_struct *handle,

-                                  SMB_STRUCT_DIR *dirp)
+                                  DIR *dirp)

 {
        /* Default behavior is a NOOP */
 }
 {
        /* Default behavior is a NOOP */
 }

diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
index 7067a5892b7189d00e52c2d79eed19a5deae69aa..f04f52d71896d93d1c462e61a8dd5ce02604c46a 100644 (file)
--- a/source3/modules/vfs_dirsort.c
+++ b/source3/modules/vfs_dirsort.c
@@ -32,7 +32,7 @@ struct dirsort_privates {
        struct dirent *directory_list;
        long number_of_entries;
        time_t mtime;
        struct dirent *directory_list;
        long number_of_entries;
        time_t mtime;

-       SMB_STRUCT_DIR *source_directory;
+       DIR *source_directory;

        int fd;
 };
 
        int fd;
 };
 


@@ -90,7 +90,7 @@ static bool open_and_sort_dir (vfs_handle_struct *handle)
        return true;
 }
 
        return true;
 }
 

-static SMB_STRUCT_DIR *dirsort_opendir(vfs_handle_struct *handle,
+static DIR *dirsort_opendir(vfs_handle_struct *handle,

                                       const char *fname, const char *mask,
                                       uint32 attr)
 {
                                       const char *fname, const char *mask,
                                       uint32 attr)
 {


@@ -124,7 +124,7 @@ static SMB_STRUCT_DIR *dirsort_opendir(vfs_handle_struct *handle,
        return data->source_directory;
 }
 
        return data->source_directory;
 }
 

-static SMB_STRUCT_DIR *dirsort_fdopendir(vfs_handle_struct *handle,
+static DIR *dirsort_fdopendir(vfs_handle_struct *handle,

                                        files_struct *fsp,
                                        const char *mask,
                                        uint32 attr)
                                        files_struct *fsp,
                                        const char *mask,
                                        uint32 attr)


@@ -167,7 +167,7 @@ static SMB_STRUCT_DIR *dirsort_fdopendir(vfs_handle_struct *handle,
 }
 
 static struct dirent *dirsort_readdir(vfs_handle_struct *handle,
 }
 
 static struct dirent *dirsort_readdir(vfs_handle_struct *handle,

-                                         SMB_STRUCT_DIR *dirp,
+                                         DIR *dirp,

                                          SMB_STRUCT_STAT *sbuf)
 {
        struct dirsort_privates *data = NULL;
                                          SMB_STRUCT_STAT *sbuf)
 {
        struct dirsort_privates *data = NULL;


@@ -195,7 +195,7 @@ static struct dirent *dirsort_readdir(vfs_handle_struct *handle,
        return &data->directory_list[data->pos++];
 }
 
        return &data->directory_list[data->pos++];
 }
 

-static void dirsort_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp,
+static void dirsort_seekdir(vfs_handle_struct *handle, DIR *dirp,

                            long offset)
 {
        struct dirsort_privates *data = NULL;
                            long offset)
 {
        struct dirsort_privates *data = NULL;


@@ -204,7 +204,7 @@ static void dirsort_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp,
        data->pos = offset;
 }
 
        data->pos = offset;
 }
 

-static long dirsort_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
+static long dirsort_telldir(vfs_handle_struct *handle, DIR *dirp)

 {
        struct dirsort_privates *data = NULL;
        SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates,
 {
        struct dirsort_privates *data = NULL;
        SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates,


@@ -213,7 +213,7 @@ static long dirsort_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
        return data->pos;
 }
 
        return data->pos;
 }
 

-static void dirsort_rewinddir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
+static void dirsort_rewinddir(vfs_handle_struct *handle, DIR *dirp)

 {
        struct dirsort_privates *data = NULL;
        SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates, return);
 {
        struct dirsort_privates *data = NULL;
        SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates, return);

diff --git a/source3/modules/vfs_extd_audit.c b/source3/modules/vfs_extd_audit.c
index 6aab9cecbe0ce8cb0927fc70d605a20a4087565e..fc23ea91488b71367be372d7004494dd430d7cc5 100644 (file)
--- a/source3/modules/vfs_extd_audit.c
+++ b/source3/modules/vfs_extd_audit.c
@@ -116,9 +116,9 @@ static void audit_disconnect(vfs_handle_struct *handle)
        return;
 }
 
        return;
 }
 

-static SMB_STRUCT_DIR *audit_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
+static DIR *audit_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)

 {
 {

-       SMB_STRUCT_DIR *result;
+       DIR *result;

 
        result = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 
 
        result = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 7997c2fab7cb4a13a5437a7682dcc0367d750ff8..34c7a848e63ad617c8d105c474e8879b3594f8b2 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -735,10 +735,10 @@ static uint32_t smb_full_audit_fs_capabilities(struct vfs_handle_struct *handle,
        return result;
 }
 
        return result;
 }
 

-static SMB_STRUCT_DIR *smb_full_audit_opendir(vfs_handle_struct *handle,
+static DIR *smb_full_audit_opendir(vfs_handle_struct *handle,

                          const char *fname, const char *mask, uint32 attr)
 {
                          const char *fname, const char *mask, uint32 attr)
 {

-       SMB_STRUCT_DIR *result;
+       DIR *result;

 
        result = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 
 
        result = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 


@@ -747,10 +747,10 @@ static SMB_STRUCT_DIR *smb_full_audit_opendir(vfs_handle_struct *handle,
        return result;
 }
 
        return result;
 }
 

-static SMB_STRUCT_DIR *smb_full_audit_fdopendir(vfs_handle_struct *handle,
+static DIR *smb_full_audit_fdopendir(vfs_handle_struct *handle,

                          files_struct *fsp, const char *mask, uint32 attr)
 {
                          files_struct *fsp, const char *mask, uint32 attr)
 {

-       SMB_STRUCT_DIR *result;
+       DIR *result;

 
        result = SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
 
 
        result = SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
 


@@ -761,7 +761,7 @@ static SMB_STRUCT_DIR *smb_full_audit_fdopendir(vfs_handle_struct *handle,
 }
 
 static struct dirent *smb_full_audit_readdir(vfs_handle_struct *handle,
 }
 
 static struct dirent *smb_full_audit_readdir(vfs_handle_struct *handle,

-                                   SMB_STRUCT_DIR *dirp, SMB_STRUCT_STAT *sbuf)
+                                   DIR *dirp, SMB_STRUCT_STAT *sbuf)

 {
        struct dirent *result;
 
 {
        struct dirent *result;
 


@@ -776,7 +776,7 @@ static struct dirent *smb_full_audit_readdir(vfs_handle_struct *handle,
 }
 
 static void smb_full_audit_seekdir(vfs_handle_struct *handle,
 }
 
 static void smb_full_audit_seekdir(vfs_handle_struct *handle,

-                       SMB_STRUCT_DIR *dirp, long offset)
+                       DIR *dirp, long offset)

 {
        SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset);
 
 {
        SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset);
 


@@ -785,7 +785,7 @@ static void smb_full_audit_seekdir(vfs_handle_struct *handle,
 }
 
 static long smb_full_audit_telldir(vfs_handle_struct *handle,
 }
 
 static long smb_full_audit_telldir(vfs_handle_struct *handle,

-                       SMB_STRUCT_DIR *dirp)
+                       DIR *dirp)

 {
        long result;
 
 {
        long result;
 


@@ -797,7 +797,7 @@ static long smb_full_audit_telldir(vfs_handle_struct *handle,
 }
 
 static void smb_full_audit_rewinddir(vfs_handle_struct *handle,
 }
 
 static void smb_full_audit_rewinddir(vfs_handle_struct *handle,

-                       SMB_STRUCT_DIR *dirp)
+                       DIR *dirp)

 {
        SMB_VFS_NEXT_REWINDDIR(handle, dirp);
 
 {
        SMB_VFS_NEXT_REWINDDIR(handle, dirp);
 


@@ -830,7 +830,7 @@ static int smb_full_audit_rmdir(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_closedir(vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_closedir(vfs_handle_struct *handle,

-                         SMB_STRUCT_DIR *dirp)
+                         DIR *dirp)

 {
        int result;
 
 {
        int result;
 


@@ -842,7 +842,7 @@ static int smb_full_audit_closedir(vfs_handle_struct *handle,
 }
 
 static void smb_full_audit_init_search_op(vfs_handle_struct *handle,
 }
 
 static void smb_full_audit_init_search_op(vfs_handle_struct *handle,

-                       SMB_STRUCT_DIR *dirp)
+                       DIR *dirp)

 {
        SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp);
 
 {
        SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp);
 

diff --git a/source3/modules/vfs_netatalk.c b/source3/modules/vfs_netatalk.c
index c4a65e07ff8bee94100b5115677d68c915097642..a4573550fad7b07d753fb967745e68c150389f3c 100644 (file)
--- a/source3/modules/vfs_netatalk.c
+++ b/source3/modules/vfs_netatalk.c
@@ -153,7 +153,7 @@ static void atalk_rrmdir(TALLOC_CTX *ctx, char *path)
 {
        char *dpath;
        struct dirent *dent = 0;
 {
        char *dpath;
        struct dirent *dent = 0;

-       SMB_STRUCT_DIR *dir;
+       DIR *dir;

 
        if (!path) return;
 
 
        if (!path) return;
 


@@ -177,9 +177,9 @@ static void atalk_rrmdir(TALLOC_CTX *ctx, char *path)
 
 /* Directory operations */
 
 
 /* Directory operations */
 

-static SMB_STRUCT_DIR *atalk_opendir(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
+static DIR *atalk_opendir(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)

 {
 {

-       SMB_STRUCT_DIR *ret = 0;
+       DIR *ret = 0;

 
        ret = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 
 
        ret = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 


@@ -198,9 +198,9 @@ static SMB_STRUCT_DIR *atalk_opendir(struct vfs_handle_struct *handle, const cha
        return ret;
 }
 
        return ret;
 }
 

-static SMB_STRUCT_DIR *atalk_fdopendir(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)
+static DIR *atalk_fdopendir(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)

 {
 {

-       SMB_STRUCT_DIR *ret = 0;
+       DIR *ret = 0;

 
        ret = SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
 
 
        ret = SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
 

diff --git a/source3/modules/vfs_onefs_shadow_copy.c b/source3/modules/vfs_onefs_shadow_copy.c
index 3b25942e68662f489d8f6fa4956a3399e4c4618c..c9b6f0809695e80f3eda9f075455e1da3f6b31d3 100644 (file)
--- a/source3/modules/vfs_onefs_shadow_copy.c
+++ b/source3/modules/vfs_onefs_shadow_copy.c
@@ -186,13 +186,13 @@ onefs_shadow_copy_statvfs(struct vfs_handle_struct *handle, const char *path,
                    int);
 }
 
                    int);
 }
 

-static SMB_STRUCT_DIR *
+static DIR *

 onefs_shadow_copy_opendir(vfs_handle_struct *handle, const char *path,
                          const char *mask, uint32_t attr)
 {
        SHADOW_NEXT(OPENDIR,
                    (handle, cpath ?: path, mask, attr),
 onefs_shadow_copy_opendir(vfs_handle_struct *handle, const char *path,
                          const char *mask, uint32_t attr)
 {
        SHADOW_NEXT(OPENDIR,
                    (handle, cpath ?: path, mask, attr),

-                   SMB_STRUCT_DIR *);
+                   DIR *);

 }
 
 static int
 }
 
 static int

diff --git a/source3/modules/vfs_scannedonly.c b/source3/modules/vfs_scannedonly.c
index 080e88c47e8c84da1ec5d2e8e1a8792c69b37c89..baf7fbefa90cfb0edbff13c1e42ccf4d5fe82f16 100644 (file)
--- a/source3/modules/vfs_scannedonly.c
+++ b/source3/modules/vfs_scannedonly.c
@@ -90,7 +90,7 @@ struct scannedonly_DIR {
        char *base;
        int recheck_tries_done; /* if 0 the directory listing has not yet
        been checked for files that need to be scanned. */
        char *base;
        int recheck_tries_done; /* if 0 the directory listing has not yet
        been checked for files that need to be scanned. */

-       SMB_STRUCT_DIR *DIR;
+       DIR *DIR;

 };
 #define SCANNEDONLY_DEBUG 9
 /*********************/
 };
 #define SCANNEDONLY_DEBUG 9
 /*********************/


@@ -506,11 +506,11 @@ static bool scannedonly_allow_access(vfs_handle_struct * handle,
 /* VFS functions     */
 /*********************/
 
 /* VFS functions     */
 /*********************/
 

-static SMB_STRUCT_DIR *scannedonly_opendir(vfs_handle_struct * handle,
+static DIR *scannedonly_opendir(vfs_handle_struct * handle,

                                           const char *fname,
                                           const char *mask, uint32 attr)
 {
                                           const char *fname,
                                           const char *mask, uint32 attr)
 {

-       SMB_STRUCT_DIR *DIRp;
+       DIR *DIRp;

        struct scannedonly_DIR *sDIR;
 
        DIRp = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
        struct scannedonly_DIR *sDIR;
 
        DIRp = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);


@@ -528,14 +528,14 @@ static SMB_STRUCT_DIR *scannedonly_opendir(vfs_handle_struct * handle,
                        ("scannedonly_opendir, fname=%s, base=%s\n",fname,sDIR->base));
        sDIR->DIR = DIRp;
        sDIR->recheck_tries_done = 0;
                        ("scannedonly_opendir, fname=%s, base=%s\n",fname,sDIR->base));
        sDIR->DIR = DIRp;
        sDIR->recheck_tries_done = 0;

-       return (SMB_STRUCT_DIR *) sDIR;
+       return (DIR *) sDIR;

 }
 
 }
 

-static SMB_STRUCT_DIR *scannedonly_fdopendir(vfs_handle_struct * handle,
+static DIR *scannedonly_fdopendir(vfs_handle_struct * handle,

                                           files_struct *fsp,
                                           const char *mask, uint32 attr)
 {
                                           files_struct *fsp,
                                           const char *mask, uint32 attr)
 {

-       SMB_STRUCT_DIR *DIRp;
+       DIR *DIRp;

        struct scannedonly_DIR *sDIR;
        const char *fname;
 
        struct scannedonly_DIR *sDIR;
        const char *fname;
 


@@ -556,12 +556,12 @@ static SMB_STRUCT_DIR *scannedonly_fdopendir(vfs_handle_struct * handle,
                        ("scannedonly_fdopendir, fname=%s, base=%s\n",fname,sDIR->base));
        sDIR->DIR = DIRp;
        sDIR->recheck_tries_done = 0;
                        ("scannedonly_fdopendir, fname=%s, base=%s\n",fname,sDIR->base));
        sDIR->DIR = DIRp;
        sDIR->recheck_tries_done = 0;

-       return (SMB_STRUCT_DIR *) sDIR;
+       return (DIR *) sDIR;

 }
 
 
 static struct dirent *scannedonly_readdir(vfs_handle_struct *handle,
 }
 
 
 static struct dirent *scannedonly_readdir(vfs_handle_struct *handle,

-                                             SMB_STRUCT_DIR * dirp,
+                                             DIR * dirp,

                                              SMB_STRUCT_STAT *sbuf)
 {
        struct dirent *result;
                                              SMB_STRUCT_STAT *sbuf)
 {
        struct dirent *result;


@@ -648,28 +648,28 @@ static struct dirent *scannedonly_readdir(vfs_handle_struct *handle,
 }
 
 static void scannedonly_seekdir(struct vfs_handle_struct *handle,
 }
 
 static void scannedonly_seekdir(struct vfs_handle_struct *handle,

-                               SMB_STRUCT_DIR * dirp, long offset)
+                               DIR * dirp, long offset)

 {
        struct scannedonly_DIR *sDIR = (struct scannedonly_DIR *)dirp;
        SMB_VFS_NEXT_SEEKDIR(handle, sDIR->DIR, offset);
 }
 
 static long scannedonly_telldir(struct vfs_handle_struct *handle,
 {
        struct scannedonly_DIR *sDIR = (struct scannedonly_DIR *)dirp;
        SMB_VFS_NEXT_SEEKDIR(handle, sDIR->DIR, offset);
 }
 
 static long scannedonly_telldir(struct vfs_handle_struct *handle,

-                               SMB_STRUCT_DIR * dirp)
+                               DIR * dirp)

 {
        struct scannedonly_DIR *sDIR = (struct scannedonly_DIR *)dirp;
        return SMB_VFS_NEXT_TELLDIR(handle, sDIR->DIR);
 }
 
 static void scannedonly_rewinddir(struct vfs_handle_struct *handle,
 {
        struct scannedonly_DIR *sDIR = (struct scannedonly_DIR *)dirp;
        return SMB_VFS_NEXT_TELLDIR(handle, sDIR->DIR);
 }
 
 static void scannedonly_rewinddir(struct vfs_handle_struct *handle,

-                                 SMB_STRUCT_DIR * dirp)
+                                 DIR * dirp)

 {
        struct scannedonly_DIR *sDIR = (struct scannedonly_DIR *)dirp;
        SMB_VFS_NEXT_REWINDDIR(handle, sDIR->DIR);
 }
 
 static int scannedonly_closedir(vfs_handle_struct * handle,
 {
        struct scannedonly_DIR *sDIR = (struct scannedonly_DIR *)dirp;
        SMB_VFS_NEXT_REWINDDIR(handle, sDIR->DIR);
 }
 
 static int scannedonly_closedir(vfs_handle_struct * handle,

-                               SMB_STRUCT_DIR * dirp)
+                               DIR * dirp)

 {
        int retval;
        struct scannedonly_DIR *sDIR = (struct scannedonly_DIR *)dirp;
 {
        int retval;
        struct scannedonly_DIR *sDIR = (struct scannedonly_DIR *)dirp;

diff --git a/source3/modules/vfs_shadow_copy.c b/source3/modules/vfs_shadow_copy.c
index 3f9bc96f0cb6cd425eab31dd057de9bf1f1499be..7b45c2e7aa6b1f4a0d65f932ccbd46efbbbf51fc 100644 (file)
--- a/source3/modules/vfs_shadow_copy.c
+++ b/source3/modules/vfs_shadow_copy.c
@@ -73,10 +73,10 @@ static bool shadow_copy_match_name(const char *name)
        return False;
 }
 
        return False;
 }
 

-static SMB_STRUCT_DIR *shadow_copy_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
+static DIR *shadow_copy_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)

 {
        shadow_copy_Dir *dirp;
 {
        shadow_copy_Dir *dirp;

-       SMB_STRUCT_DIR *p = SMB_VFS_NEXT_OPENDIR(handle,fname,mask,attr);
+       DIR *p = SMB_VFS_NEXT_OPENDIR(handle,fname,mask,attr);

 
        if (!p) {
                DEBUG(0,("shadow_copy_opendir: SMB_VFS_NEXT_OPENDIR() failed for [%s]\n",fname));
 
        if (!p) {
                DEBUG(0,("shadow_copy_opendir: SMB_VFS_NEXT_OPENDIR() failed for [%s]\n",fname));


@@ -117,13 +117,13 @@ static SMB_STRUCT_DIR *shadow_copy_opendir(vfs_handle_struct *handle, const char
        }
 
        SMB_VFS_NEXT_CLOSEDIR(handle,p);
        }
 
        SMB_VFS_NEXT_CLOSEDIR(handle,p);

-       return((SMB_STRUCT_DIR *)dirp);
+       return((DIR *)dirp);

 }
 
 }
 

-static SMB_STRUCT_DIR *shadow_copy_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)
+static DIR *shadow_copy_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)

 {
        shadow_copy_Dir *dirp;
 {
        shadow_copy_Dir *dirp;

-       SMB_STRUCT_DIR *p = SMB_VFS_NEXT_FDOPENDIR(handle,fsp,mask,attr);
+       DIR *p = SMB_VFS_NEXT_FDOPENDIR(handle,fsp,mask,attr);

 
        if (!p) {
                DEBUG(10,("shadow_copy_opendir: SMB_VFS_NEXT_FDOPENDIR() failed for [%s]\n",
 
        if (!p) {
                DEBUG(10,("shadow_copy_opendir: SMB_VFS_NEXT_FDOPENDIR() failed for [%s]\n",


@@ -169,11 +169,11 @@ static SMB_STRUCT_DIR *shadow_copy_fdopendir(vfs_handle_struct *handle, files_st
        SMB_VFS_NEXT_CLOSEDIR(handle,p);
        /* We have now closed the fd in fsp. */
        fsp->fh->fd = -1;
        SMB_VFS_NEXT_CLOSEDIR(handle,p);
        /* We have now closed the fd in fsp. */
        fsp->fh->fd = -1;

-       return((SMB_STRUCT_DIR *)dirp);
+       return((DIR *)dirp);

 }
 
 static struct dirent *shadow_copy_readdir(vfs_handle_struct *handle,
 }
 
 static struct dirent *shadow_copy_readdir(vfs_handle_struct *handle,

-                                             SMB_STRUCT_DIR *_dirp,
+                                             DIR *_dirp,

                                              SMB_STRUCT_STAT *sbuf)
 {
        shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp;
                                              SMB_STRUCT_STAT *sbuf)
 {
        shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp;


@@ -185,7 +185,7 @@ static struct dirent *shadow_copy_readdir(vfs_handle_struct *handle,
        return NULL;
 }
 
        return NULL;
 }
 

-static void shadow_copy_seekdir(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *_dirp, long offset)
+static void shadow_copy_seekdir(struct vfs_handle_struct *handle, DIR *_dirp, long offset)

 {
        shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp;
 
 {
        shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp;
 


@@ -194,19 +194,19 @@ static void shadow_copy_seekdir(struct vfs_handle_struct *handle, SMB_STRUCT_DIR
        }
 }
 
        }
 }
 

-static long shadow_copy_telldir(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *_dirp)
+static long shadow_copy_telldir(struct vfs_handle_struct *handle, DIR *_dirp)

 {
        shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp;
        return( dirp->pos ) ;
 }
 
 {
        shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp;
        return( dirp->pos ) ;
 }
 

-static void shadow_copy_rewinddir(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *_dirp)
+static void shadow_copy_rewinddir(struct vfs_handle_struct *handle, DIR *_dirp)

 {
        shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp;
        dirp->pos = 0 ;
 }
 
 {
        shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp;
        dirp->pos = 0 ;
 }
 

-static int shadow_copy_closedir(vfs_handle_struct *handle, SMB_STRUCT_DIR *_dirp)
+static int shadow_copy_closedir(vfs_handle_struct *handle, DIR *_dirp)

 {
        shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp;
 
 {
        shadow_copy_Dir *dirp = (shadow_copy_Dir *)_dirp;
 


@@ -221,7 +221,7 @@ static int shadow_copy_get_shadow_copy_data(vfs_handle_struct *handle,
                                            struct shadow_copy_data *shadow_copy_data,
                                            bool labels)
 {
                                            struct shadow_copy_data *shadow_copy_data,
                                            bool labels)
 {

-       SMB_STRUCT_DIR *p = SMB_VFS_NEXT_OPENDIR(handle,fsp->conn->connectpath,NULL,0);
+       DIR *p = SMB_VFS_NEXT_OPENDIR(handle,fsp->conn->connectpath,NULL,0);

 
        shadow_copy_data->num_volumes = 0;
        shadow_copy_data->labels = NULL;
 
        shadow_copy_data->num_volumes = 0;
        shadow_copy_data->labels = NULL;

diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index 14d33085c2c7c767826c0cd770b899399470972c..755a9b616c2e57c44a9f27d819bbf88b19c4b6d5 100644 (file)
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -447,14 +447,14 @@ static void convert_sbuf(vfs_handle_struct *handle, const char *fname,
        }
 }
 
        }
 }
 

-static SMB_STRUCT_DIR *shadow_copy2_opendir(vfs_handle_struct *handle,
+static DIR *shadow_copy2_opendir(vfs_handle_struct *handle,

                                            const char *fname,
                                            const char *mask,
                                            uint32 attr)
 {
        time_t timestamp;
        char *stripped;
                                            const char *fname,
                                            const char *mask,
                                            uint32 attr)
 {
        time_t timestamp;
        char *stripped;

-       SMB_STRUCT_DIR *ret;
+       DIR *ret;

        int saved_errno;
        char *conv;
 
        int saved_errno;
        char *conv;
 


@@ -1076,7 +1076,7 @@ static int shadow_copy2_get_shadow_copy_data(
        struct shadow_copy_data *shadow_copy2_data,
        bool labels)
 {
        struct shadow_copy_data *shadow_copy2_data,
        bool labels)
 {

-       SMB_STRUCT_DIR *p;
+       DIR *p;

        const char *snapdir;
        struct dirent *d;
        TALLOC_CTX *tmp_ctx = talloc_stackframe();
        const char *snapdir;
        struct dirent *d;
        TALLOC_CTX *tmp_ctx = talloc_stackframe();

diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c
index f268492adebbdea1c9329ed69fcab81f6af78b43..172a0c634d392442d8dd743f57a2e629dbf9b225 100644 (file)
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -374,7 +374,7 @@ static NTSTATUS walk_streams(vfs_handle_struct *handle,
                             void *private_data)
 {
        char *dirname;
                             void *private_data)
 {
        char *dirname;

-       SMB_STRUCT_DIR *dirhandle = NULL;
+       DIR *dirhandle = NULL;

        const char *dirent = NULL;
        char *talloced = NULL;
 
        const char *dirent = NULL;
        char *talloced = NULL;
 

diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index 76e917c15dc48d6eaa870d9aaa56fb9db72eb802..035f2df40683398f7ca01c38593cf30075a307af 100644 (file)
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -203,11 +203,11 @@ static uint32_t smb_time_audit_fs_capabilities(struct vfs_handle_struct *handle,
        return result;
 }
 
        return result;
 }
 

-static SMB_STRUCT_DIR *smb_time_audit_opendir(vfs_handle_struct *handle,
+static DIR *smb_time_audit_opendir(vfs_handle_struct *handle,

                                              const char *fname,
                                              const char *mask, uint32 attr)
 {
                                              const char *fname,
                                              const char *mask, uint32 attr)
 {

-       SMB_STRUCT_DIR *result;
+       DIR *result;

        struct timespec ts1,ts2;
        double timediff;
 
        struct timespec ts1,ts2;
        double timediff;
 


@@ -223,11 +223,11 @@ static SMB_STRUCT_DIR *smb_time_audit_opendir(vfs_handle_struct *handle,
        return result;
 }
 
        return result;
 }
 

-static SMB_STRUCT_DIR *smb_time_audit_fdopendir(vfs_handle_struct *handle,
+static DIR *smb_time_audit_fdopendir(vfs_handle_struct *handle,

                                              files_struct *fsp,
                                              const char *mask, uint32 attr)
 {
                                              files_struct *fsp,
                                              const char *mask, uint32 attr)
 {

-       SMB_STRUCT_DIR *result;
+       DIR *result;

        struct timespec ts1,ts2;
        double timediff;
 
        struct timespec ts1,ts2;
        double timediff;
 


@@ -244,7 +244,7 @@ static SMB_STRUCT_DIR *smb_time_audit_fdopendir(vfs_handle_struct *handle,
 }
 
 static struct dirent *smb_time_audit_readdir(vfs_handle_struct *handle,
 }
 
 static struct dirent *smb_time_audit_readdir(vfs_handle_struct *handle,

-                                                SMB_STRUCT_DIR *dirp,
+                                                DIR *dirp,

                                                 SMB_STRUCT_STAT *sbuf)
 {
        struct dirent *result;
                                                 SMB_STRUCT_STAT *sbuf)
 {
        struct dirent *result;


@@ -264,7 +264,7 @@ static struct dirent *smb_time_audit_readdir(vfs_handle_struct *handle,
 }
 
 static void smb_time_audit_seekdir(vfs_handle_struct *handle,
 }
 
 static void smb_time_audit_seekdir(vfs_handle_struct *handle,

-                                  SMB_STRUCT_DIR *dirp, long offset)
+                                  DIR *dirp, long offset)

 {
        struct timespec ts1,ts2;
        double timediff;
 {
        struct timespec ts1,ts2;
        double timediff;


@@ -282,7 +282,7 @@ static void smb_time_audit_seekdir(vfs_handle_struct *handle,
 }
 
 static long smb_time_audit_telldir(vfs_handle_struct *handle,
 }
 
 static long smb_time_audit_telldir(vfs_handle_struct *handle,

-                                  SMB_STRUCT_DIR *dirp)
+                                  DIR *dirp)

 {
        long result;
        struct timespec ts1,ts2;
 {
        long result;
        struct timespec ts1,ts2;


@@ -301,7 +301,7 @@ static long smb_time_audit_telldir(vfs_handle_struct *handle,
 }
 
 static void smb_time_audit_rewinddir(vfs_handle_struct *handle,
 }
 
 static void smb_time_audit_rewinddir(vfs_handle_struct *handle,

-                                    SMB_STRUCT_DIR *dirp)
+                                    DIR *dirp)

 {
        struct timespec ts1,ts2;
        double timediff;
 {
        struct timespec ts1,ts2;
        double timediff;


@@ -357,7 +357,7 @@ static int smb_time_audit_rmdir(vfs_handle_struct *handle,
 }
 
 static int smb_time_audit_closedir(vfs_handle_struct *handle,
 }
 
 static int smb_time_audit_closedir(vfs_handle_struct *handle,

-                                  SMB_STRUCT_DIR *dirp)
+                                  DIR *dirp)

 {
        int result;
        struct timespec ts1,ts2;
 {
        int result;
        struct timespec ts1,ts2;


@@ -376,7 +376,7 @@ static int smb_time_audit_closedir(vfs_handle_struct *handle,
 }
 
 static void smb_time_audit_init_search_op(vfs_handle_struct *handle,
 }
 
 static void smb_time_audit_init_search_op(vfs_handle_struct *handle,

-                                         SMB_STRUCT_DIR *dirp)
+                                         DIR *dirp)

 {
        struct timespec ts1,ts2;
        double timediff;
 {
        struct timespec ts1,ts2;
        double timediff;

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d42b04f18bfa25fd6597d4326f81d5e5a5975e77..5d8c3a7680d0bc624bc298a66986226f540cfc79 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -8253,7 +8253,7 @@ enum usershare_err parse_usershare_file(TALLOC_CTX *ctx,
        const char **prefixallowlist = lp_usershare_prefix_allow_list();
        const char **prefixdenylist = lp_usershare_prefix_deny_list();
        int us_vers;
        const char **prefixallowlist = lp_usershare_prefix_allow_list();
        const char **prefixdenylist = lp_usershare_prefix_deny_list();
        int us_vers;

-       SMB_STRUCT_DIR *dp;
+       DIR *dp;

        SMB_STRUCT_STAT sbuf;
        char *sharepath = NULL;
        char *comment = NULL;
        SMB_STRUCT_STAT sbuf;
        char *sharepath = NULL;
        char *comment = NULL;


@@ -8732,7 +8732,7 @@ int load_usershare_service(const char *servicename)
 int load_usershare_shares(struct smbd_server_connection *sconn,
                          bool (*snumused) (struct smbd_server_connection *, int))
 {
 int load_usershare_shares(struct smbd_server_connection *sconn,
                          bool (*snumused) (struct smbd_server_connection *, int))
 {

-       SMB_STRUCT_DIR *dp;
+       DIR *dp;

        SMB_STRUCT_STAT sbuf;
        struct dirent *de;
        int num_usershares = 0;
        SMB_STRUCT_STAT sbuf;
        struct dirent *de;
        int num_usershares = 0;

diff --git a/source3/rpc_server/samr/srv_samr_chgpasswd.c b/source3/rpc_server/samr/srv_samr_chgpasswd.c
index a88f61437f7f8bebb40a1d1f585a893ec95428a9..94d7021349ed652bbf4d44f9fc447cb3fd2fa196 100644 (file)
--- a/source3/rpc_server/samr/srv_samr_chgpasswd.c
+++ b/source3/rpc_server/samr/srv_samr_chgpasswd.c
@@ -67,7 +67,7 @@ static int findpty(char **slave)
 {
        int master = -1;
        char *line = NULL;
 {
        int master = -1;
        char *line = NULL;

-       SMB_STRUCT_DIR *dirp = NULL;
+       DIR *dirp = NULL;

        const char *dpname;
 
        *slave = NULL;
        const char *dpname;
 
        *slave = NULL;

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 103dbc8a339ce28e2944b91e6fd669a1a480eaf9..79a0f8bf18f0a3519ffe999e0f623da0ea075ed1 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -43,7 +43,7 @@ struct name_cache_entry {
 
 struct smb_Dir {
        connection_struct *conn;
 
 struct smb_Dir {
        connection_struct *conn;

-       SMB_STRUCT_DIR *dir;
+       DIR *dir;

        long offset;
        char *dir_path;
        size_t name_cache_size;
        long offset;
        char *dir_path;
        size_t name_cache_size;

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 7dc604c15b32783ffcb4f5e3dbc618178e3b51df..b7a505284e7d1f9a83c9924da9636bf9cfa29374 100644 (file)
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -1288,7 +1288,7 @@ bool remove_msdfs_link(const struct junction_map *jucn)
 static int count_dfs_links(TALLOC_CTX *ctx, int snum)
 {
        size_t cnt = 0;
 static int count_dfs_links(TALLOC_CTX *ctx, int snum)
 {
        size_t cnt = 0;

-       SMB_STRUCT_DIR *dirp = NULL;
+       DIR *dirp = NULL;

        const char *dname = NULL;
        char *talloced = NULL;
        const char *connect_path = lp_pathname(snum);
        const char *dname = NULL;
        char *talloced = NULL;
        const char *connect_path = lp_pathname(snum);


@@ -1355,7 +1355,7 @@ static int form_junctions(TALLOC_CTX *ctx,
                                size_t jn_remain)
 {
        size_t cnt = 0;
                                size_t jn_remain)
 {
        size_t cnt = 0;

-       SMB_STRUCT_DIR *dirp = NULL;
+       DIR *dirp = NULL;

        const char *dname = NULL;
        char *talloced = NULL;
        const char *connect_path = lp_pathname(snum);
        const char *dname = NULL;
        char *talloced = NULL;
        const char *connect_path = lp_pathname(snum);

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index cb7d2e4496698ab1d50e7abc1f58c15a52c0c47c..33f270170432b9a204a0ee1c1aaa945dc3294b29 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -729,7 +729,7 @@ const char *vfs_readdirname(connection_struct *conn, void *p,
        if (!p)
                return(NULL);
 
        if (!p)
                return(NULL);
 

-       ptr = SMB_VFS_READDIR(conn, (SMB_STRUCT_DIR *)p, sbuf);
+       ptr = SMB_VFS_READDIR(conn, (DIR *)p, sbuf);

        if (!ptr)
                return(NULL);
 
        if (!ptr)
                return(NULL);
 


@@ -1388,7 +1388,7 @@ NTSTATUS smb_vfs_call_get_dfs_referrals(struct vfs_handle_struct *handle,
        return handle->fns->get_dfs_referrals_fn(handle, r);
 }
 
        return handle->fns->get_dfs_referrals_fn(handle, r);
 }
 

-SMB_STRUCT_DIR *smb_vfs_call_opendir(struct vfs_handle_struct *handle,
+DIR *smb_vfs_call_opendir(struct vfs_handle_struct *handle,

                                     const char *fname, const char *mask,
                                     uint32 attributes)
 {
                                     const char *fname, const char *mask,
                                     uint32 attributes)
 {


@@ -1396,7 +1396,7 @@ SMB_STRUCT_DIR *smb_vfs_call_opendir(struct vfs_handle_struct *handle,
        return handle->fns->opendir_fn(handle, fname, mask, attributes);
 }
 
        return handle->fns->opendir_fn(handle, fname, mask, attributes);
 }
 

-SMB_STRUCT_DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle,
+DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle,

                                        struct files_struct *fsp,
                                        const char *mask,
                                        uint32 attributes)
                                        struct files_struct *fsp,
                                        const char *mask,
                                        uint32 attributes)


@@ -1406,7 +1406,7 @@ SMB_STRUCT_DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle,
 }
 
 struct dirent *smb_vfs_call_readdir(struct vfs_handle_struct *handle,
 }
 
 struct dirent *smb_vfs_call_readdir(struct vfs_handle_struct *handle,

-                                             SMB_STRUCT_DIR *dirp,
+                                             DIR *dirp,

                                              SMB_STRUCT_STAT *sbuf)
 {
        VFS_FIND(readdir);
                                              SMB_STRUCT_STAT *sbuf)
 {
        VFS_FIND(readdir);


@@ -1414,21 +1414,21 @@ struct dirent *smb_vfs_call_readdir(struct vfs_handle_struct *handle,
 }
 
 void smb_vfs_call_seekdir(struct vfs_handle_struct *handle,
 }
 
 void smb_vfs_call_seekdir(struct vfs_handle_struct *handle,

-                         SMB_STRUCT_DIR *dirp, long offset)
+                         DIR *dirp, long offset)

 {
        VFS_FIND(seekdir);
        handle->fns->seekdir_fn(handle, dirp, offset);
 }
 
 long smb_vfs_call_telldir(struct vfs_handle_struct *handle,
 {
        VFS_FIND(seekdir);
        handle->fns->seekdir_fn(handle, dirp, offset);
 }
 
 long smb_vfs_call_telldir(struct vfs_handle_struct *handle,

-                         SMB_STRUCT_DIR *dirp)
+                         DIR *dirp)

 {
        VFS_FIND(telldir);
        return handle->fns->telldir_fn(handle, dirp);
 }
 
 void smb_vfs_call_rewind_dir(struct vfs_handle_struct *handle,
 {
        VFS_FIND(telldir);
        return handle->fns->telldir_fn(handle, dirp);
 }
 
 void smb_vfs_call_rewind_dir(struct vfs_handle_struct *handle,

-                            SMB_STRUCT_DIR *dirp)
+                            DIR *dirp)

 {
        VFS_FIND(rewind_dir);
        handle->fns->rewind_dir_fn(handle, dirp);
 {
        VFS_FIND(rewind_dir);
        handle->fns->rewind_dir_fn(handle, dirp);


@@ -1448,14 +1448,14 @@ int smb_vfs_call_rmdir(struct vfs_handle_struct *handle, const char *path)
 }
 
 int smb_vfs_call_closedir(struct vfs_handle_struct *handle,
 }
 
 int smb_vfs_call_closedir(struct vfs_handle_struct *handle,

-                         SMB_STRUCT_DIR *dir)
+                         DIR *dir)

 {
        VFS_FIND(closedir);
        return handle->fns->closedir_fn(handle, dir);
 }
 
 void smb_vfs_call_init_search_op(struct vfs_handle_struct *handle,
 {
        VFS_FIND(closedir);
        return handle->fns->closedir_fn(handle, dir);
 }
 
 void smb_vfs_call_init_search_op(struct vfs_handle_struct *handle,

-                                SMB_STRUCT_DIR *dirp)
+                                DIR *dirp)

 {
        VFS_FIND(init_search_op);
        handle->fns->init_search_op_fn(handle, dirp);
 {
        VFS_FIND(init_search_op);
        handle->fns->init_search_op_fn(handle, dirp);

diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c
index b7ec7a94c38d267f4c309bb341f532d3960ff206..b11757a61194e8d0c7ddf8d4ef438de34e07b562 100644 (file)
--- a/source3/utils/net_usershare.c
+++ b/source3/utils/net_usershare.c
@@ -208,7 +208,7 @@ static struct file_list *flist;
 
 static int get_share_list(TALLOC_CTX *ctx, const char *wcard, bool only_ours)
 {
 
 static int get_share_list(TALLOC_CTX *ctx, const char *wcard, bool only_ours)
 {

-       SMB_STRUCT_DIR *dp;
+       DIR *dp;

        struct dirent *de;
        uid_t myuid = geteuid();
        struct file_list *fl = NULL;
        struct dirent *de;
        uid_t myuid = geteuid();
        struct file_list *fl = NULL;


@@ -546,7 +546,7 @@ static int net_usershare_info(struct net_context *c, int argc, const char **argv
 
 static int count_num_usershares(void)
 {
 
 static int count_num_usershares(void)
 {

-       SMB_STRUCT_DIR *dp;
+       DIR *dp;

        struct dirent *de;
        int num_usershares = 0;
        TALLOC_CTX *ctx = talloc_tos();
        struct dirent *de;
        int num_usershares = 0;
        TALLOC_CTX *ctx = talloc_tos();


@@ -1059,7 +1059,7 @@ static int net_usershare_list(struct net_context *c, int argc,
 
 int net_usershare(struct net_context *c, int argc, const char **argv)
 {
 
 int net_usershare(struct net_context *c, int argc, const char **argv)
 {

-       SMB_STRUCT_DIR *dp;
+       DIR *dp;

 
        struct functable func[] = {
                {
 
        struct functable func[] = {
                {