diff options
| -rw-r--r-- | source4/ntvfs/posix/pvfs_shortname.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/posix/vfs_posix.c | 8 | ||||
| -rw-r--r-- | source4/param/loadparm.c | 8 |
3 files changed, 6 insertions, 12 deletions
diff --git a/source4/ntvfs/posix/pvfs_shortname.c b/source4/ntvfs/posix/pvfs_shortname.c index c0fc2fb136..9efd1cec85 100644 --- a/source4/ntvfs/posix/pvfs_shortname.c +++ b/source4/ntvfs/posix/pvfs_shortname.c @@ -604,7 +604,7 @@ NTSTATUS pvfs_mangle_init(struct pvfs_state *pvfs) memset(ctx->prefix_cache, 0, sizeof(char *)*MANGLE_CACHE_SIZE); memset(ctx->prefix_cache_hashes, 0, sizeof(uint32_t)*MANGLE_CACHE_SIZE); - ctx->mangle_prefix = lp_parm_int(-1, "mangle", "prefix"); + ctx->mangle_prefix = lp_parm_int(-1, "mangle", "prefix", -1); if (ctx->mangle_prefix < 0 || ctx->mangle_prefix > 6) { ctx->mangle_prefix = DEFAULT_MANGLE_PREFIX; } diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index 6f4de1e038..eecc379064 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -34,7 +34,6 @@ static void pvfs_setup_options(struct pvfs_state *pvfs) { int snum = pvfs->tcon->service; - int delay; const char *eadb; if (lp_map_hidden(snum)) pvfs->flags |= PVFS_FLAG_MAP_HIDDEN; @@ -53,11 +52,7 @@ static void pvfs_setup_options(struct pvfs_state *pvfs) if (lp_parm_bool(snum, "posix", "xattr", True)) pvfs->flags |= PVFS_FLAG_XATTR_ENABLE; #endif - pvfs->sharing_violation_delay = 1000000; - delay = lp_parm_int(snum, "posix", "sharedelay"); - if (delay != -1) { - pvfs->sharing_violation_delay = delay; - } + pvfs->sharing_violation_delay = lp_parm_int(snum, "posix", "sharedelay", 1000000); pvfs->share_name = talloc_strdup(pvfs, lp_servicename(snum)); @@ -81,7 +76,6 @@ static void pvfs_setup_options(struct pvfs_state *pvfs) } } - if (pvfs->flags & PVFS_FLAG_XATTR_ENABLE) { pvfs->fs_attribs |= FS_ATTR_NAMED_STREAMS; } diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 1ecc53fac0..eabf70b6d0 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -1436,27 +1436,27 @@ char **lp_parm_string_list(int lookup_service, const char *type, const char *opt /* Return parametric option from a given service. Type is a part of option before ':' */ /* Parametric option has following syntax: 'Type: option = value' */ -int lp_parm_int(int lookup_service, const char *type, const char *option) +int lp_parm_int(int lookup_service, const char *type, const char *option, int default_v) { const char *value = get_parametrics(lookup_service, type, option); if (value) return lp_int(value); - return (-1); + return default_v; } /* Return parametric option from a given service. Type is a part of option before ':' */ /* Parametric option has following syntax: 'Type: option = value' */ -unsigned long lp_parm_ulong(int lookup_service, const char *type, const char *option) +unsigned long lp_parm_ulong(int lookup_service, const char *type, const char *option, unsigned long default_v) { const char *value = get_parametrics(lookup_service, type, option); if (value) return lp_ulong(value); - return (0); + return default_v; } /* Return parametric option from a given service. Type is a part of option before ':' */ |