diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-02-14 16:10:51 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-02-16 00:29:20 -0800 |
| commit | 6bd7e2b097c54615929b9fdcb7ca00a3fa4cc2aa (patch) | |
| tree | f2d57c285368ee5951b4224c2a74e58e5324a85e | |
| parent | dea223ba7914ff9cdc1a35720086c437c74fc5ac (diff) | |
| download | samba-6bd7e2b097c54615929b9fdcb7ca00a3fa4cc2aa.tar.gz samba-6bd7e2b097c54615929b9fdcb7ca00a3fa4cc2aa.tar.bz2 samba-6bd7e2b097c54615929b9fdcb7ca00a3fa4cc2aa.zip | |
s3 OneFS: Add defaults to the fake timestamp parameters
| -rw-r--r-- | source3/modules/onefs.h | 8 | ||||
| -rw-r--r-- | source3/modules/vfs_onefs.c | 19 |
2 files changed, 19 insertions, 8 deletions
diff --git a/source3/modules/onefs.h b/source3/modules/onefs.h index 126b75628a..b979cfd7eb 100644 --- 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 fe0dfc9ea0..9667d86dba 100644 --- 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); } |