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

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index b8deff4114cbb02b21cce8319929b8b37a6a9ca9..7aaecf47dd15adeefb47a6dae4a5c927c8387024 100644 (file)
--- 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 c9b466cfb77db93d4dc26c278095e6e61a591f81..54898c9b4f5d433d27367901fca4f6380456f686 100644 (file)
--- 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 75008fed1e01bed2b5d07c782d5f607f113bd6a5..4a26a12ee88e20662b2a7dc282bb25214d9daaff 100644 (file)
--- 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;