diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-09 23:16:55 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-11 13:41:34 +1100 |
| commit | 26de383c428a513a4aaceb2460ea6d20a088e2d4 (patch) | |
| tree | f04097d9245ff3a9cdf6e73124a7c69578a97628 | |
| parent | b21b012756dbb9e7022280b34d7103a5dcbea6d6 (diff) | |
| download | samba-26de383c428a513a4aaceb2460ea6d20a088e2d4.tar.gz samba-26de383c428a513a4aaceb2460ea6d20a088e2d4.tar.bz2 samba-26de383c428a513a4aaceb2460ea6d20a088e2d4.zip | |
libcli/smb Move CSC_POLICY_* definition to smb_constants.h
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
| -rw-r--r-- | lib/param/loadparm.c | 6 | ||||
| -rw-r--r-- | libcli/smb/smb_constants.h | 8 | ||||
| -rw-r--r-- | source3/include/smb.h | 6 |
3 files changed, 8 insertions, 12 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index b8deff4114..7aaecf47dd 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -132,12 +132,6 @@ static const struct enum_list enum_bool_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 -}; static const struct enum_list enum_csc_policy[] = { {CSC_POLICY_MANUAL, "manual"}, diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h index c9b466cfb7..54898c9b4f 100644 --- a/libcli/smb/smb_constants.h +++ b/libcli/smb/smb_constants.h @@ -50,6 +50,14 @@ enum smb_signing_setting { SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, 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 */ #define FLAGS2_LONG_PATH_COMPONENTS 0x0001 #define FLAGS2_EXTENDED_ATTRIBUTES 0x0002 diff --git a/source3/include/smb.h b/source3/include/smb.h index 75008fed1e..4a26a12ee8 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1650,12 +1650,6 @@ struct child_pid { /* Used to keep track of deferred opens. */ 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. */ struct aio_extra; |