diff options
author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-29 17:04:00 +0000 |
---|---|---|
committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-29 17:04:00 +0000 |
commit | 7352220be0a924426d375d1f29346bf7bc7dc6ae (patch) | |
tree | d78225e2f65676feade603c780712ea6accdca93 /res | |
parent | 4a0675ab443c417ff532d6d7a15ad11fc826034e (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@59354 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/res_odbc.c | 11 |
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; |