diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/client.h | 5 | ||||
| -rw-r--r-- | source3/include/ctdbd_conn.h | 2 | ||||
| -rw-r--r-- | source3/include/libsmb_internal.h | 1 | ||||
| -rw-r--r-- | source3/include/messages.h | 6 | ||||
| -rw-r--r-- | source3/include/smb.h | 23 |
5 files changed, 10 insertions, 27 deletions
diff --git a/source3/include/client.h b/source3/include/client.h index 09f96601c0..3f92d6dcde 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -22,7 +22,7 @@ #ifndef _CLIENT_H #define _CLIENT_H -#define CLI_BUFFER_SIZE (0xFFFF) +#define CLI_BUFFER_SIZE SMB_BUFFER_SIZE_MAX /* default client timeout to 20 seconds on most commands */ #define CLIENT_TIMEOUT (20 * 1000) @@ -77,7 +77,6 @@ struct cli_state { uint32_t server_posix_capabilities; /* What the client requested. */ uint32_t requested_posix_capabilities; - bool dfsroot; bool backup_intent; /* The list of pipes currently open on this connection. */ @@ -91,8 +90,6 @@ struct cli_state { bool use_oplocks; /* should we use oplocks? */ - bool case_sensitive; /* False by default. */ - /* Where (if anywhere) this is mounted under DFS. */ char *dfs_mountpoint; diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h index 64cb1d5ade..bba63f8dd0 100644 --- a/source3/include/ctdbd_conn.h +++ b/source3/include/ctdbd_conn.h @@ -76,7 +76,7 @@ NTSTATUS ctdbd_traverse(uint32_t db_id, NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, const struct sockaddr_storage *server, const struct sockaddr_storage *client, - void (*release_ip_handler)(const char *ip_addr, + bool (*release_ip_handler)(const char *ip_addr, void *private_data), void *private_data); diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h index 63c96fecd1..ce73181fac 100644 --- a/source3/include/libsmb_internal.h +++ b/source3/include/libsmb_internal.h @@ -78,6 +78,7 @@ struct _SMBCSRV { dev_t dev; bool no_pathinfo; bool no_pathinfo2; + bool no_pathinfo3; bool no_nt_session; struct policy_handle pol; diff --git a/source3/include/messages.h b/source3/include/messages.h index 12fc439969..09c39cc9b0 100644 --- a/source3/include/messages.h +++ b/source3/include/messages.h @@ -101,6 +101,9 @@ bool messaging_tdb_parent_init(TALLOC_CTX *mem_ctx); void *messaging_tdb_event(TALLOC_CTX *mem_ctx, struct messaging_context *msg, struct tevent_context *ev); +NTSTATUS messaging_tdb_cleanup(struct messaging_context *msg_ctx, + struct server_id pid); + NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx, TALLOC_CTX *mem_ctx, struct messaging_backend **presult); @@ -140,6 +143,9 @@ NTSTATUS messaging_send_buf(struct messaging_context *msg_ctx, void messaging_dispatch_rec(struct messaging_context *msg_ctx, struct messaging_rec *rec); +void messaging_cleanup_server(struct messaging_context *msg_ctx, + struct server_id pid); + #include "librpc/gen_ndr/ndr_messaging.h" #endif diff --git a/source3/include/smb.h b/source3/include/smb.h index e1ab34409d..7ff997e2de 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -32,11 +32,9 @@ /* logged when starting the various Samba daemons */ #define COPYRIGHT_STARTUP_MESSAGE "Copyright Andrew Tridgell and the Samba Team 1992-2013" - -#define BUFFER_SIZE (128*1024) - #define SAFETY_MARGIN 1024 #define LARGE_WRITEX_HDR_SIZE 65 +#define LARGE_WRITEX_BUFFER_SIZE (128*1024) #define NMB_PORT 137 #define DGRAM_PORT 138 @@ -513,25 +511,6 @@ Offset Data length. #define RENAME_FLAG_RENAME 0x104 #define RENAME_FLAG_COPY 0x105 -/* Filesystem Attributes. */ -#define FILE_CASE_SENSITIVE_SEARCH 0x00000001 -#define FILE_CASE_PRESERVED_NAMES 0x00000002 -#define FILE_UNICODE_ON_DISK 0x00000004 -/* According to cifs9f, this is 4, not 8 */ -/* Acconding to testing, this actually sets the security attribute! */ -#define FILE_PERSISTENT_ACLS 0x00000008 -#define FILE_FILE_COMPRESSION 0x00000010 -#define FILE_VOLUME_QUOTAS 0x00000020 -#define FILE_SUPPORTS_SPARSE_FILES 0x00000040 -#define FILE_SUPPORTS_REPARSE_POINTS 0x00000080 -#define FILE_SUPPORTS_REMOTE_STORAGE 0x00000100 -#define FS_LFN_APIS 0x00004000 -#define FILE_VOLUME_IS_COMPRESSED 0x00008000 -#define FILE_SUPPORTS_OBJECT_IDS 0x00010000 -#define FILE_SUPPORTS_ENCRYPTION 0x00020000 -#define FILE_NAMED_STREAMS 0x00040000 -#define FILE_READ_ONLY_VOLUME 0x00080000 - /* ChangeNotify flags. */ #define FILE_NOTIFY_CHANGE_FILE_NAME 0x001 #define FILE_NOTIFY_CHANGE_DIR_NAME 0x002 |