diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-02-03 12:12:31 +0100 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2013-02-03 13:01:30 +0100 |
| commit | 4d0fb44754d91504b84092eb2197bc635740d540 (patch) | |
| tree | 1c54bd4235804a217fd05014038cd10f670c8a26 /src/openvpn/misc.c | |
| parent | c2f4c1918202f4395438663804b0806c93790501 (diff) | |
| download | openvpn-4d0fb44754d91504b84092eb2197bc635740d540.tar.gz openvpn-4d0fb44754d91504b84092eb2197bc635740d540.tar.xz openvpn-4d0fb44754d91504b84092eb2197bc635740d540.zip | |
Remove dead code path and putenv functionality
The construct_name_value function call will always fail so this code path
is never used. Since we now always have a valid environment in
static_context->c2.es it is better to have a ASSERT(es) than to call this
code patch.
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: David Sommerseth <davids@redhat.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: 1359889951-3369-1-git-send-email-arne@rfc2549.org
URL: http://article.gmane.org/gmane.network.openvpn.devel/7323
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/misc.c')
| -rw-r--r-- | src/openvpn/misc.c | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/src/openvpn/misc.c b/src/openvpn/misc.c index fcc8552..fa327f8 100644 --- a/src/openvpn/misc.c +++ b/src/openvpn/misc.c @@ -707,13 +707,6 @@ env_set_remove_from_environment (const struct env_set *es) static struct env_item *global_env = NULL; /* GLOBAL */ -void -manage_env (char *str) -{ - remove_env_item (str, true, &global_env); - add_env_item (str, false, &global_env, NULL); -} - #endif /* add/modify/delete environmental strings */ @@ -789,27 +782,18 @@ setenv_str_ex (struct env_set *es, if (value) val_tmp = string_mod_const (value, value_include, value_exclude, value_replace, &gc); - if (es) + ASSERT (es); + + if (val_tmp) { - if (val_tmp) - { - const char *str = construct_name_value (name_tmp, val_tmp, &gc); - env_set_add (es, str); + const char *str = construct_name_value (name_tmp, val_tmp, &gc); + env_set_add (es, str); #if DEBUG_VERBOSE_SETENV - msg (M_INFO, "SETENV_ES '%s'", str); + msg (M_INFO, "SETENV_ES '%s'", str); #endif - } - else - env_set_del (es, name_tmp); } else - { - char *str = construct_name_value (name_tmp, val_tmp, NULL); - if (platform_putenv(str)) - { - msg (M_WARN | M_ERRNO, "putenv('%s') failed", str); - } - } + env_set_del (es, name_tmp); gc_free (&gc); } |