s3 OneFS: Add defaults to the fake timestamp parameters

diff --git a/source3/modules/onefs.h b/source3/modules/onefs.h
index 126b75628ae1d5737be0a17bc6e30365bad3573a..b979cfd7eb54781d9081a68f98783f95bca626aa 100644 (file)
--- a/source3/modules/onefs.h
+++ b/source3/modules/onefs.h
@@ -42,17 +42,25 @@ enum onefs_acl_wire_format
 #define PARM_ACL_WIRE_FORMAT "acl wire format"
 #define PARM_ACL_WIRE_FORMAT_DEFAULT ACL_FORMAT_WINDOWS_SD
 #define PARM_ATIME_NOW         "atime now files"
+#define PARM_ATIME_NOW_DEFAULT  NULL
 #define PARM_ATIME_STATIC      "atime static files"
+#define PARM_ATIME_STATIC_DEFAULT NULL
 #define PARM_ATIME_SLOP                "atime now slop"
+#define PARM_ATIME_SLOP_DEFAULT         0
 #define PARM_CREATOR_OWNER_GETS_FULL_CONTROL "creator owner gets full control"
 #define PARM_CREATOR_OWNER_GETS_FULL_CONTROL_DEFAULT true
 #define PARM_CTIME_NOW         "ctime now files"
+#define PARM_CTIME_NOW_DEFAULT  NULL
 #define PARM_CTIME_SLOP                "ctime now slop"
+#define PARM_CTIME_SLOP_DEFAULT        0
 #define PARM_IGNORE_SACLS "ignore sacls"
 #define PARM_IGNORE_SACLS_DEFAULT false
 #define PARM_MTIME_NOW         "mtime now files"
+#define PARM_MTIME_NOW_DEFAULT NULL
 #define PARM_MTIME_STATIC      "mtime static files"
+#define PARM_MTIME_STATIC_DEFAULT NULL
 #define PARM_MTIME_SLOP                "mtime now slop"
+#define PARM_MTIME_SLOP_DEFAULT        0
 #define PARM_USE_READDIRPLUS "use readdirplus"
 #define PARM_USE_READDIRPLUS_DEFAULT true
 #define PARM_SIMPLE_FILE_SHARING_COMPATIBILITY_MODE "simple file sharing compatibility mode"

diff --git a/source3/modules/vfs_onefs.c b/source3/modules/vfs_onefs.c
index fe0dfc9ea0025b138fe8ae25c4077e8d329d0c91..9667d86dbad6d7cbb485896736064518a5547b60 100644 (file)
--- a/source3/modules/vfs_onefs.c
+++ b/source3/modules/vfs_onefs.c
@@ -36,7 +36,7 @@ static void onefs_load_faketimestamp_config(struct vfs_handle_struct *handle,
        int snum = SNUM(handle->conn);
 
        parm = lp_parm_string_list(snum, PARM_ONEFS_TYPE, PARM_ATIME_NOW,
-                                  NULL);
+                                  PARM_ATIME_NOW_DEFAULT);
 
        if (parm) {
                cfg->init_flags |= ONEFS_VFS_CONFIG_FAKETIMESTAMPS;
@@ -44,7 +44,7 @@ static void onefs_load_faketimestamp_config(struct vfs_handle_struct *handle,
        }
 
        parm = lp_parm_string_list(snum, PARM_ONEFS_TYPE, PARM_CTIME_NOW,
-                                  NULL);
+                                  PARM_CTIME_NOW_DEFAULT);
 
        if (parm) {
                cfg->init_flags |= ONEFS_VFS_CONFIG_FAKETIMESTAMPS;
@@ -52,7 +52,7 @@ static void onefs_load_faketimestamp_config(struct vfs_handle_struct *handle,
        }
 
        parm = lp_parm_string_list(snum, PARM_ONEFS_TYPE, PARM_MTIME_NOW,
-                                  NULL);
+                                  PARM_MTIME_NOW_DEFAULT);
 
        if (parm) {
                cfg->init_flags |= ONEFS_VFS_CONFIG_FAKETIMESTAMPS;
@@ -60,7 +60,7 @@ static void onefs_load_faketimestamp_config(struct vfs_handle_struct *handle,
        }
 
        parm = lp_parm_string_list(snum, PARM_ONEFS_TYPE, PARM_ATIME_STATIC,
-                                  NULL);
+                                  PARM_ATIME_STATIC_DEFAULT);
 
        if (parm) {
                cfg->init_flags |= ONEFS_VFS_CONFIG_FAKETIMESTAMPS;
@@ -68,16 +68,19 @@ static void onefs_load_faketimestamp_config(struct vfs_handle_struct *handle,
        }
 
        parm = lp_parm_string_list(snum, PARM_ONEFS_TYPE, PARM_MTIME_STATIC,
-                                  NULL);
+                                  PARM_MTIME_STATIC_DEFAULT);
 
        if (parm) {
                cfg->init_flags |= ONEFS_VFS_CONFIG_FAKETIMESTAMPS;
                set_namearray(&cfg->mtime_static_list,*parm);
        }
 
-       cfg->atime_slop = lp_parm_int(snum, PARM_ONEFS_TYPE, PARM_ATIME_SLOP,0);
-       cfg->ctime_slop = lp_parm_int(snum, PARM_ONEFS_TYPE, PARM_CTIME_SLOP,0);
-       cfg->mtime_slop = lp_parm_int(snum, PARM_ONEFS_TYPE, PARM_MTIME_SLOP,0);
+       cfg->atime_slop = lp_parm_int(snum, PARM_ONEFS_TYPE, PARM_ATIME_SLOP,
+                                     PARM_ATIME_SLOP_DEFAULT);
+       cfg->ctime_slop = lp_parm_int(snum, PARM_ONEFS_TYPE, PARM_CTIME_SLOP,
+                                     PARM_CTIME_SLOP_DEFAULT);
+       cfg->mtime_slop = lp_parm_int(snum, PARM_ONEFS_TYPE, PARM_MTIME_SLOP,
+                                     PARM_MTIME_SLOP_DEFAULT);
 }