sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

libcli/smb move FILE_TYPE constants in common

Browse Source 
This allows us to remove another _SAMBA_BUILD_ conditional

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2011-07-06 13:06:14 +10:00
parent 6543987139
commit 7891848357
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcli/named_pipe_auth/npa_tstream.c
View File

@ -24,9 +24,7 @@
#include "../lib/tsocket/tsocket_internal.h"
#include "../librpc/gen_ndr/ndr_named_pipe_auth.h"
#include "../libcli/named_pipe_auth/npa_tstream.h"
#if _SAMBA_BUILD_ == 4
#include "libcli/raw/smb.h"
#endif
#include "../libcli/smb/smb_constants.h"
static const struct tstream_context_ops tstream_npa_ops;

8
libcli/smb/smb_constants.h
View File

@ -71,4 +71,12 @@ enum protocol_types {
FILE_ATTRIBUTE_DIRECTORY|\
FILE_ATTRIBUTE_ARCHIVE)
/* File type flags */
#define FILE_TYPE_DISK 0
#define FILE_TYPE_BYTE_MODE_PIPE 1
#define FILE_TYPE_MESSAGE_MODE_PIPE 2
#define FILE_TYPE_PRINTER 3
#define FILE_TYPE_COMM_DEVICE 4
#define FILE_TYPE_UNKNOWN 0xFFFF
#endif /* _SMB_CONSTANTS_H */

8
source3/include/smb.h
View File

@ -1085,14 +1085,6 @@ struct bitmap {
#define FILE_WAS_CREATED 2
#define FILE_WAS_OVERWRITTEN 3
/* File type flags */
#define FILE_TYPE_DISK 0
#define FILE_TYPE_BYTE_MODE_PIPE 1
#define FILE_TYPE_MESSAGE_MODE_PIPE 2
#define FILE_TYPE_PRINTER 3
#define FILE_TYPE_COMM_DEVICE 4
#define FILE_TYPE_UNKNOWN 0xFFFF
/* Flag for NT transact rename call. */
#define RENAME_REPLACE_IF_EXISTS 1

8
source4/libcli/raw/smb.h
View File

@ -381,14 +381,6 @@
#define FILE_WAS_CREATED 2
#define FILE_WAS_OVERWRITTEN 3
/* File type flags */
#define FILE_TYPE_DISK 0
#define FILE_TYPE_BYTE_MODE_PIPE 1
#define FILE_TYPE_MESSAGE_MODE_PIPE 2
#define FILE_TYPE_PRINTER 3
#define FILE_TYPE_COMM_DEVICE 4
#define FILE_TYPE_UNKNOWN 0xFFFF
/* Flag for NT transact rename call. */
#define RENAME_REPLACE_IF_EXISTS 1