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

lib/param: handle non-constant strings properly by passing in a memory context

Browse Source 
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Change-Id: Ic6bb1c709defd2b0f35fc7b877da0badca385776
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@samba.org>
This commit is contained in:
Garming Sam
2014-01-17 10:30:37 +13:00
committed by Andrew Bartlett
parent bce62e6000
commit 1fb1f6bc0d
5 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/param/loadparm.c
View File

@ -207,12 +207,13 @@ static struct loadparm_context *global_loadparm_context;
#define lpcfg_global_service(i) global_loadparm_context->services[i] #define lpcfg_global_service(i) global_loadparm_context->services[i]
#define FN_GLOBAL_STRING(fn_name,var_name) \ #define FN_GLOBAL_STRING(fn_name,var_name) \
_PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_context *lp_ctx) {\ _PUBLIC_ char *lpcfg_ ## fn_name(struct loadparm_context *lp_ctx, TALLOC_CTX *ctx) {\
if (lp_ctx == NULL) return NULL; \ if (lp_ctx == NULL) return NULL; \
if (lp_ctx->s3_fns) { \ if (lp_ctx->s3_fns) { \
smb_panic( __location__ ": " #fn_name " not implemented because it is an allocated and substiuted string"); \ SMB_ASSERT(lp_ctx->s3_fns->fn_name); \
return lp_ctx->s3_fns->fn_name(ctx); \
} \ } \
return lp_ctx->globals->var_name ? lp_string(lp_ctx->globals->var_name) : ""; \ return lp_ctx->globals->var_name ? talloc_strdup(ctx, lp_string(lp_ctx->globals->var_name)) : talloc_strdup(ctx, ""); \
} }
#define FN_GLOBAL_CONST_STRING(fn_name,var_name) \ #define FN_GLOBAL_CONST_STRING(fn_name,var_name) \
@ -258,12 +259,16 @@ static struct loadparm_context *global_loadparm_context;
* loadparm_service is shared and lpcfg_service() checks the ->s3_fns * loadparm_service is shared and lpcfg_service() checks the ->s3_fns
* hook */ * hook */
#define FN_LOCAL_STRING(fn_name,val) \ #define FN_LOCAL_STRING(fn_name,val) \
_PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_service *service, \ _PUBLIC_ char *lpcfg_ ## fn_name(struct loadparm_service *service, \
struct loadparm_service *sDefault) { \ struct loadparm_service *sDefault, TALLOC_CTX *ctx) { \
return(lp_string((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault->val))); \ return(talloc_strdup(ctx, lp_string((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault->val)))); \
} }
#define FN_LOCAL_CONST_STRING(fn_name,val) FN_LOCAL_STRING(fn_name, val) #define FN_LOCAL_CONST_STRING(fn_name,val) \
_PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_service *service, \
struct loadparm_service *sDefault) { \
return((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault->val)); \
}
#define FN_LOCAL_LIST(fn_name,val) \ #define FN_LOCAL_LIST(fn_name,val) \
_PUBLIC_ const char **lpcfg_ ## fn_name(struct loadparm_service *service, \ _PUBLIC_ const char **lpcfg_ ## fn_name(struct loadparm_service *service, \
@ -720,7 +725,7 @@ bool lpcfg_add_home(struct loadparm_context *lp_ctx,
|| strequal(default_service->path, lp_ctx->sDefault->path)) { || strequal(default_service->path, lp_ctx->sDefault->path)) {
service->path = talloc_strdup(service, pszHomedir); service->path = talloc_strdup(service, pszHomedir);
} else { } else {
service->path = string_sub_talloc(service, lpcfg_path(default_service, lp_ctx->sDefault), "%H", pszHomedir); service->path = string_sub_talloc(service, lpcfg_path(default_service, lp_ctx->sDefault, service), "%H", pszHomedir);
} }
if (!(*(service->comment))) { if (!(*(service->comment))) {
@ -2421,13 +2426,21 @@ const char *lp_default_path(void)
static bool lpcfg_update(struct loadparm_context *lp_ctx) static bool lpcfg_update(struct loadparm_context *lp_ctx)
{ {
struct debug_settings settings; struct debug_settings settings;
lpcfg_add_auto_services(lp_ctx, lpcfg_auto_services(lp_ctx)); TALLOC_CTX *tmp_ctx;
tmp_ctx = talloc_new(lp_ctx);
if (tmp_ctx == NULL) {
return false;
}
lpcfg_add_auto_services(lp_ctx, lpcfg_auto_services(lp_ctx, tmp_ctx));
if (!lp_ctx->globals->wins_server_list && lp_ctx->globals->we_are_a_wins_server) { if (!lp_ctx->globals->wins_server_list && lp_ctx->globals->we_are_a_wins_server) {
lpcfg_do_global_parameter(lp_ctx, "wins server", "127.0.0.1"); lpcfg_do_global_parameter(lp_ctx, "wins server", "127.0.0.1");
} }
if (!lp_ctx->global) { if (!lp_ctx->global) {
TALLOC_FREE(tmp_ctx);
return true; return true;
} }
@ -2456,6 +2469,7 @@ static bool lpcfg_update(struct loadparm_context *lp_ctx)
unsetenv("SOCKET_TESTNONBLOCK"); unsetenv("SOCKET_TESTNONBLOCK");
} }
TALLOC_FREE(tmp_ctx);
return true; return true;
} }

19
script/generate_param.py
View File

@ -177,7 +177,7 @@ def make_lib_proto(path_in, path_out):
continue continue
output_string = "" output_string = ""
if parameter['constant'] or parameter['type'] == 'string': if parameter['constant']:
output_string += 'const ' output_string += 'const '
param_type = mapping.get(parameter['type']) param_type = mapping.get(parameter['type'])
if param_type is None: if param_type is None:
@ -186,6 +186,14 @@ def make_lib_proto(path_in, path_out):
output_string += "lpcfg_%s" % parameter['function'] output_string += "lpcfg_%s" % parameter['function']
if parameter['type'] == 'string' and not parameter['constant']:
if parameter['context'] == 'G':
output_string += '(struct loadparm_context *, TALLOC_CTX *ctx);\n'
elif parameter['context'] == 'S':
output_string += '(struct loadparm_service *, struct loadparm_service *, TALLOC_CTX *ctx);\n'
else:
raise Exception(parameter['name'] + " has an invalid param type " + parameter['type'])
else:
if parameter['context'] == 'G': if parameter['context'] == 'G':
output_string += '(struct loadparm_context *);\n' output_string += '(struct loadparm_context *);\n'
elif parameter['context'] == 'S': elif parameter['context'] == 'S':
@ -277,9 +285,6 @@ def make_s3_param(path_in, path_out):
continue continue
if parameter['context'] != 'G': if parameter['context'] != 'G':
continue continue
# STRING isn't handle yet properly
if parameter['type'] == 'string' and not parameter['constant']:
continue
output_string = "\t" output_string = "\t"
if parameter['constant'] or parameter['type'] == 'string': if parameter['constant'] or parameter['type'] == 'string':
output_string += 'const ' output_string += 'const '
@ -288,6 +293,9 @@ def make_s3_param(path_in, path_out):
raise Exception(parameter['name'] + " has an invalid context " + parameter['context']) raise Exception(parameter['name'] + " has an invalid context " + parameter['context'])
output_string += param_type output_string += param_type
if parameter['type'] == 'string' and not parameter['constant']:
output_string += " (*%s)(TALLOC_CTX *);\n" % parameter['function']
else:
output_string += " (*%s)(void);\n" % parameter['function'] output_string += " (*%s)(void);\n" % parameter['function']
file_out.write(output_string) file_out.write(output_string)
@ -321,9 +329,6 @@ def make_s3_param_ctx_table(path_in, path_out):
continue continue
if parameter['context'] != 'G': if parameter['context'] != 'G':
continue continue
# STRING isn't handle yet properly
if parameter['type'] == 'string' and not parameter['constant']:
continue
output_string = "\t.%s" % parameter['function'] output_string = "\t.%s" % parameter['function']
output_string += " = lp_%s,\n" % parameter['function'] output_string += " = lp_%s,\n" % parameter['function']
file_out.write(output_string) file_out.write(output_string)

2
source4/nbt_server/wins/winsdb.c
View File

@ -994,7 +994,7 @@ struct winsdb_handle *winsdb_connect(TALLOC_CTX *mem_ctx,
if (!h->ldb) goto failed; if (!h->ldb) goto failed;
h->caller = caller; h->caller = caller;
h->hook_script = lpcfg_wins_hook(lp_ctx); h->hook_script = lpcfg_wins_hook(lp_ctx, h);
h->local_owner = talloc_strdup(h, owner); h->local_owner = talloc_strdup(h, owner);
if (!h->local_owner) goto failed; if (!h->local_owner) goto failed;

4
source4/param/share_classic.c
View File

@ -77,11 +77,11 @@ static char *sclassic_string_option(TALLOC_CTX *mem_ctx,
} }
if (strcmp(opt_name, SHARE_PATH) == 0) { if (strcmp(opt_name, SHARE_PATH) == 0) {
return lpcfg_path(s, lpcfg_default_service(lp_ctx)); return lpcfg_path(s, lpcfg_default_service(lp_ctx), mem_ctx);
} }
if (strcmp(opt_name, SHARE_COMMENT) == 0) { if (strcmp(opt_name, SHARE_COMMENT) == 0) {
return lpcfg_comment(s, lpcfg_default_service(lp_ctx)); return lpcfg_comment(s, lpcfg_default_service(lp_ctx), mem_ctx);
} }
if (strcmp(opt_name, SHARE_VOLUME) == 0) { if (strcmp(opt_name, SHARE_VOLUME) == 0) {

4
source4/rpc_server/srvsvc/dcesrv_srvsvc.c
View File

@ -1464,7 +1464,7 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
info101->version_major = server_info->version_major; info101->version_major = server_info->version_major;
info101->version_minor = server_info->version_minor; info101->version_minor = server_info->version_minor;
info101->server_type = dcesrv_common_get_server_type(mem_ctx, dce_call->event_ctx, dce_ctx); info101->server_type = dcesrv_common_get_server_type(mem_ctx, dce_call->event_ctx, dce_ctx);
info101->comment = talloc_strdup(mem_ctx, lpcfg_server_string(dce_ctx->lp_ctx)); info101->comment = lpcfg_server_string(dce_ctx->lp_ctx, mem_ctx);
W_ERROR_HAVE_NO_MEMORY(info101->comment); W_ERROR_HAVE_NO_MEMORY(info101->comment);
r->out.info->info101 = info101; r->out.info->info101 = info101;
@ -1484,7 +1484,7 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
info102->version_major = server_info->version_major; info102->version_major = server_info->version_major;
info102->version_minor = server_info->version_minor; info102->version_minor = server_info->version_minor;
info102->server_type = dcesrv_common_get_server_type(mem_ctx, dce_call->event_ctx, dce_ctx); info102->server_type = dcesrv_common_get_server_type(mem_ctx, dce_call->event_ctx, dce_ctx);
info102->comment = talloc_strdup(mem_ctx, lpcfg_server_string(dce_ctx->lp_ctx)); info102->comment = lpcfg_server_string(dce_ctx->lp_ctx, mem_ctx);
W_ERROR_HAVE_NO_MEMORY(info102->comment); W_ERROR_HAVE_NO_MEMORY(info102->comment);
info102->users = dcesrv_common_get_users(mem_ctx, dce_ctx); info102->users = dcesrv_common_get_users(mem_ctx, dce_ctx);