sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-31 22:02:58 +03:00
Code Activity

r4423: give lp_parm_int() and lp_parm_ulong() default values

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher
2004-12-31 01:03:57 +00:00
committed by Gerald (Jerry) Carter
parent 19482a2245
commit c44f4d44b5
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/ntvfs/posix/pvfs_shortname.c
View File

@ -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, 0, sizeof(char *)*MANGLE_CACHE_SIZE);
memset(ctx->prefix_cache_hashes, 0, sizeof(uint32_t)*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) { if (ctx->mangle_prefix < 0 || ctx->mangle_prefix > 6) {
ctx->mangle_prefix = DEFAULT_MANGLE_PREFIX; ctx->mangle_prefix = DEFAULT_MANGLE_PREFIX;
} }

8
source/ntvfs/posix/vfs_posix.c
View File

@ -34,7 +34,6 @@
static void pvfs_setup_options(struct pvfs_state *pvfs) static void pvfs_setup_options(struct pvfs_state *pvfs)
{ {
int snum = pvfs->tcon->service; int snum = pvfs->tcon->service;
int delay;
const char *eadb; const char *eadb;
if (lp_map_hidden(snum)) pvfs->flags |= PVFS_FLAG_MAP_HIDDEN; 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; if (lp_parm_bool(snum, "posix", "xattr", True)) pvfs->flags |= PVFS_FLAG_XATTR_ENABLE;
#endif #endif
pvfs->sharing_violation_delay = 1000000; pvfs->sharing_violation_delay = lp_parm_int(snum, "posix", "sharedelay", 1000000);
delay = lp_parm_int(snum, "posix", "sharedelay");
if (delay != -1) {
pvfs->sharing_violation_delay = delay;
}
pvfs->share_name = talloc_strdup(pvfs, lp_servicename(snum)); 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) { if (pvfs->flags & PVFS_FLAG_XATTR_ENABLE) {
pvfs->fs_attribs |= FS_ATTR_NAMED_STREAMS; pvfs->fs_attribs |= FS_ATTR_NAMED_STREAMS;
} }

8
source/param/loadparm.c
View File

@ -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 ':' */ /* Return parametric option from a given service. Type is a part of option before ':' */
/* Parametric option has following syntax: 'Type: option = value' */ /* 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); const char *value = get_parametrics(lookup_service, type, option);
if (value) if (value)
return lp_int(value); return lp_int(value);
return (-1); return default_v;
} }
/* Return parametric option from a given service. Type is a part of option before ':' */ /* Return parametric option from a given service. Type is a part of option before ':' */
/* Parametric option has following syntax: 'Type: option = value' */ /* 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); const char *value = get_parametrics(lookup_service, type, option);
if (value) if (value)
return lp_ulong(value); return lp_ulong(value);
return (0); return default_v;
} }
/* Return parametric option from a given service. Type is a part of option before ':' */ /* Return parametric option from a given service. Type is a part of option before ':' */