sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

libcli/smb Move CSC_POLICY_* definition to smb_constants.h

Browse Source 
This removes the duplicate definition between smb.h and lib/param/loadparm.c
which in turn allows this file to be compiled with the s3 includes.h

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2011-10-09 23:16:55 +11:00
parent b21b012756
commit 26de383c42
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/param/loadparm.c
View File

@ -132,12 +132,6 @@ static const struct enum_list enum_bool_auto[] = {
}; };
/* Client-side offline caching policy types */ /* Client-side offline caching policy types */
enum csc_policy {
CSC_POLICY_MANUAL=0,
CSC_POLICY_DOCUMENTS=1,
CSC_POLICY_PROGRAMS=2,
CSC_POLICY_DISABLE=3
};
static const struct enum_list enum_csc_policy[] = { static const struct enum_list enum_csc_policy[] = {
{CSC_POLICY_MANUAL, "manual"}, {CSC_POLICY_MANUAL, "manual"},

8
libcli/smb/smb_constants.h
View File

@ -50,6 +50,14 @@ enum smb_signing_setting {
SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED,
SMB_SIGNING_REQUIRED, SMB_SIGNING_AUTO}; SMB_SIGNING_REQUIRED, SMB_SIGNING_AUTO};
/* Client-side offline caching policy types */
enum csc_policy {
CSC_POLICY_MANUAL=0,
CSC_POLICY_DOCUMENTS=1,
CSC_POLICY_PROGRAMS=2,
CSC_POLICY_DISABLE=3
};
/* NT Flags2 bits - cifs6.txt section 3.1.2 */ /* NT Flags2 bits - cifs6.txt section 3.1.2 */
#define FLAGS2_LONG_PATH_COMPONENTS 0x0001 #define FLAGS2_LONG_PATH_COMPONENTS 0x0001
#define FLAGS2_EXTENDED_ATTRIBUTES 0x0002 #define FLAGS2_EXTENDED_ATTRIBUTES 0x0002

6
source3/include/smb.h
View File

@ -1650,12 +1650,6 @@ struct child_pid {
/* Used to keep track of deferred opens. */ /* Used to keep track of deferred opens. */
struct deferred_open_record; struct deferred_open_record;
/* Client-side offline caching policy types */
#define CSC_POLICY_MANUAL 0
#define CSC_POLICY_DOCUMENTS 1
#define CSC_POLICY_PROGRAMS 2
#define CSC_POLICY_DISABLE 3
/* Used inside aio code. */ /* Used inside aio code. */
struct aio_extra; struct aio_extra;