diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/doserr.h | 1 | ||||
| -rw-r--r-- | source3/include/messages.h | 4 | ||||
| -rw-r--r-- | source3/include/proto.h | 17 | ||||
| -rw-r--r-- | source3/include/smb.h | 3 |
4 files changed, 20 insertions, 5 deletions
diff --git a/source3/include/doserr.h b/source3/include/doserr.h index 44ce73973c..68dc0c13c0 100644 --- a/source3/include/doserr.h +++ b/source3/include/doserr.h @@ -206,6 +206,7 @@ #define WERR_INVALID_COMPUTER_NAME W_ERROR(1210) #define WERR_INVALID_DOMAINNAME W_ERROR(1212) #define WERR_MACHINE_LOCKED W_ERROR(1271) +#define WERR_REVISION_MISMATCH W_ERROR(1306) #define WERR_NO_LOGON_SERVERS W_ERROR(1311) #define WERR_NO_SUCH_LOGON_SESSION W_ERROR(1312) #define WERR_USER_ALREADY_EXISTS W_ERROR(1316) diff --git a/source3/include/messages.h b/source3/include/messages.h index 8f0112acc5..b3ac5e4d98 100644 --- a/source3/include/messages.h +++ b/source3/include/messages.h @@ -87,6 +87,10 @@ */ #define MSG_SMB_BRL_VALIDATE 0x0311 #define MSG_SMB_RELEASE_IP 0x0312 +/* + * Close a specific file given a share entry. + */ +#define MSG_SMB_CLOSE_FILE 0x0313 /* winbind messages */ #define MSG_WINBIND_FINISHED 0x0401 diff --git a/source3/include/proto.h b/source3/include/proto.h index f85b667c84..761c720497 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1582,8 +1582,12 @@ NTSTATUS read_smb_length_return_keepalive(int fd, char *inbuf, size_t *len); NTSTATUS read_smb_length(int fd, char *inbuf, unsigned int timeout, size_t *len); -NTSTATUS receive_smb_raw(int fd, char *buffer, unsigned int timeout, - size_t maxlen, size_t *p_len); +NTSTATUS receive_smb_raw(int fd, + char *buffer, + size_t buflen, + unsigned int timeout, + size_t maxlen, + size_t *p_len); int open_socket_in(int type, uint16_t port, int dlevel, @@ -5270,7 +5274,7 @@ void locking_close_file(struct messaging_context *msg_ctx, bool locking_init(void); bool locking_init_readonly(void); bool locking_end(void); -char *share_mode_str(TALLOC_CTX *ctx, int num, struct share_mode_entry *e); +char *share_mode_str(TALLOC_CTX *ctx, int num, const struct share_mode_entry *e); struct share_mode_lock *get_share_mode_lock(TALLOC_CTX *mem_ctx, const struct file_id id, const char *servicepath, @@ -9462,6 +9466,11 @@ NTSTATUS change_oem_password(struct samu *hnd, char *old_passwd, char *new_passw void set_close_write_time(struct files_struct *fsp, struct timespec ts); NTSTATUS close_file(files_struct *fsp, enum file_close_type close_type); +void msg_close_file(struct messaging_context *msg_ctx, + void *private_data, + uint32_t msg_type, + struct server_id server_id, + DATA_BLOB *data); /* The following definitions come from smbd/conn.c */ @@ -9937,7 +9946,7 @@ bool downgrade_oplock(files_struct *fsp); int oplock_notify_fd(void); void reply_to_oplock_break_requests(files_struct *fsp); void release_level_2_oplocks_on_change(files_struct *fsp); -void share_mode_entry_to_message(char *msg, struct share_mode_entry *e); +void share_mode_entry_to_message(char *msg, const struct share_mode_entry *e); void message_to_share_mode_entry(struct share_mode_entry *e, char *msg); bool init_oplocks(struct messaging_context *msg_ctx); diff --git a/source3/include/smb.h b/source3/include/smb.h index e7860b7903..76cc389a10 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1709,7 +1709,8 @@ minimum length == 18. enum smbd_capability { KERNEL_OPLOCK_CAPABILITY, - DMAPI_ACCESS_CAPABILITY + DMAPI_ACCESS_CAPABILITY, + LEASE_CAPABILITY }; /* if a kernel does support oplocks then a structure of the following |