Change ENV section to use setenv, instead of putenv (Alexandru Pirvulescu <sigxcpu...

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@59299 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_odbc.c b/res/res_odbc.c
index 92cd1ccfbb4d1cbf9ac0353368ea4034de602ec2..87b34c08bb751737faf2437dfed0946ef3db4018 100644 (file)
--- 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;