diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 12 | ||||
| -rw-r--r-- | source3/include/smb_macros.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index f52bff2ce0..89ee6cbdc3 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -3608,12 +3608,12 @@ int reply_nttrans(connection_struct *conn, #if OLD_NTDOMAIN int fd_close(struct connection_struct *conn, files_struct *fsp); -files_struct *open_file_shared(connection_struct *conn,char *fname,int share_mode,int ofun, - mode_t mode,int oplock_request, int *Access,int *action); -files_struct *open_file_stat(connection_struct *conn, - char *fname, int smb_ofun, SMB_STRUCT_STAT *pst, int *action); -files_struct *open_directory(connection_struct *conn, - char *fname, int smb_ofun, mode_t unixmode, int *action); +files_struct *open_file_shared(connection_struct *conn,char *fname, SMB_STRUCT_STAT *psbuf, + int share_mode,int ofun, mode_t mode,int oplock_request, int *Access,int *action); +files_struct *open_file_stat(connection_struct *conn, char *fname, + SMB_STRUCT_STAT *psbuf, int smb_ofun, int *action); +files_struct *open_directory(connection_struct *conn, char *fname, + SMB_STRUCT_STAT *psbuf, int smb_ofun, mode_t unixmode, int *action); BOOL check_file_sharing(connection_struct *conn,char *fname, BOOL rename_op); #endif diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index a65b7048e9..2e74d7e69f 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -104,8 +104,8 @@ * stat structure is valid. */ -#define VALID_STAT(st) (st.st_nlink != 0) -#define VALID_STAT_OF_DIR(st) (VALID_STAT(st) && S_ISDIR(st.st_mode)) +#define VALID_STAT(st) ((st).st_nlink != 0) +#define VALID_STAT_OF_DIR(st) (VALID_STAT(st) && S_ISDIR((st).st_mode)) #define SMBENCRYPT() (lp_encrypted_passwords()) |