aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-29 15:33:10 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-29 15:33:10 +0000
commite1ce2352385c08a6ea631dcff4ceded863458e0e (patch)
tree555737960dfc21396c992dafe8e24a35a51f6aa0 /res
parentf30b820a6642c7a21e2911b662f79c6edea3e7ca (diff)
Change ENV section to use setenv, instead of putenv (Alexandru Pirvulescu <sigxcpu@gmail.com>, reported via -dev list)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@59299 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_odbc.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 92cd1ccfb..87b34c08b 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -251,7 +251,6 @@ static int load_odbc_config(void)
char *cat, *dsn, *username, *password;
int enabled;
int connect = 0;
- char *env_var;
odbc_obj *obj;
@@ -260,16 +259,10 @@ static int load_odbc_config(void)
for (cat = ast_category_browse(config, NULL); cat; cat=ast_category_browse(config, cat)) {
if (!strcmp(cat, "ENV")) {
for (v = ast_variable_browse(config, cat); v; v = v->next) {
- env_var = malloc(strlen(v->name) + strlen(v->value) + 2);
- if (env_var) {
- sprintf(env_var, "%s=%s", v->name, v->value);
- ast_log(LOG_NOTICE, "Adding ENV var: %s=%s\n", v->name, v->value);
- putenv(env_var);
- free(env_var);
- }
+ setenv(v->name, v->value, 1);
}
- cat = ast_category_browse(config, cat);
+ cat = ast_category_browse(config, cat);
}
dsn = username = password = NULL;