diff --git a/crmd/crmd_alerts.c b/crmd/crmd_alerts.c
index c66cbac2bb..bc6ee3dba1 100644
--- a/crmd/crmd_alerts.c
+++ b/crmd/crmd_alerts.c
@@ -1,381 +1,378 @@
/*
* Copyright (C) 2015 Andrew Beekhof <andrew@beekhof.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <crm_internal.h>
#include <crm/crm.h>
#include <crm/msg_xml.h>
#include <crm/pengine/rules.h>
#include "crmd_alerts.h"
#include "crmd_messages.h"
#include <crm/common/alerts_internal.h>
#include <crm/common/iso8601_internal.h>
static char *notify_script = NULL;
static char *notify_target = NULL;
static int alerts_inflight = 0;
static gboolean draining_alerts = FALSE;
/*
* syncronize local data with cib
*/
static GHashTable *
get_meta_attrs_from_cib(xmlNode *basenode, crm_alert_entry_t *entry,
guint *max_timeout)
{
GHashTable *config_hash =
g_hash_table_new_full(crm_str_hash, g_str_equal,
g_hash_destroy_str, g_hash_destroy_str);
crm_time_t *now = crm_time_new(NULL);
const char *value = NULL;
unpack_instance_attributes(basenode, basenode, XML_TAG_META_SETS, NULL,
config_hash, NULL, FALSE, now);
value = g_hash_table_lookup(config_hash, XML_ALERT_ATTR_TIMEOUT);
if (value) {
entry->timeout = crm_get_msec(value);
if (entry->timeout <= 0) {
if (entry->timeout == 0) {
crm_trace("Setting timeout to default %dmsec",
CRM_ALERT_DEFAULT_TIMEOUT_MS);
} else {
crm_warn("Invalid timeout value setting to default %dmsec",
CRM_ALERT_DEFAULT_TIMEOUT_MS);
}
entry->timeout = CRM_ALERT_DEFAULT_TIMEOUT_MS;
} else {
crm_trace("Found timeout %dmsec", entry->timeout);
}
if (entry->timeout > *max_timeout) {
*max_timeout = entry->timeout;
}
}
value = g_hash_table_lookup(config_hash, XML_ALERT_ATTR_TSTAMP_FORMAT);
if (value) {
/* hard to do any checks here as merely anything can
* can be a valid time-format-string
*/
entry->tstamp_format = (char *) value;
crm_trace("Found timestamp format string '%s'", value);
}
crm_time_free(now);
return config_hash; /* keep hash as long as strings are needed */
}
void
parse_notifications(xmlNode *notifications)
{
xmlNode *notify;
crm_alert_entry_t entry;
guint max_timeout = 0;
crm_free_notify_list();
crm_alert_max_alert_timeout = CRM_ALERT_DEFAULT_TIMEOUT_MS;
if (notifications) {
crm_info("We have an alerts section in the cib");
if (notify_script) {
crm_warn("Cib contains configuration for Legacy Notifications "
"which is overruled by alerts section");
}
} else {
crm_info("No optional alerts section in cib");
if (notify_script) {
entry = (crm_alert_entry_t) {
.id = (char *) "legacy_notification",
.path = notify_script,
.timeout = CRM_ALERT_DEFAULT_TIMEOUT_MS,
.recipient = notify_target
};
crm_add_dup_notify_list_entry(&entry);
crm_info("Legacy Notifications enabled");
}
return;
}
for (notify = first_named_child(notifications, XML_CIB_TAG_ALERT);
notify; notify = __xml_next(notify)) {
xmlNode *recipient;
int recipients = 0, envvars = 0;
GHashTable *config_hash = NULL;
entry = (crm_alert_entry_t) {
.id = (char *) crm_element_value(notify, XML_ATTR_ID),
.path = (char *) crm_element_value(notify, XML_ALERT_ATTR_PATH),
.timeout = CRM_ALERT_DEFAULT_TIMEOUT_MS,
.tstamp_format = (char *) CRM_ALERT_DEFAULT_TSTAMP_FORMAT
};
- entry.envvars =
- crm_get_envvars_from_cib(notify,
- entry.envvars,
+ crm_get_envvars_from_cib(notify,
+ &entry,
&envvars);
config_hash =
get_meta_attrs_from_cib(notify, &entry, &max_timeout);
crm_debug("Found alert: id=%s, path=%s, timeout=%d, "
"tstamp_format=%s, %d additional environment variables",
entry.id, entry.path, entry.timeout,
entry.tstamp_format, envvars);
for (recipient = first_named_child(notify,
XML_CIB_TAG_ALERT_RECIPIENT);
recipient; recipient = __xml_next(recipient)) {
int envvars_added = 0;
entry.recipient = (char *) crm_element_value(recipient,
XML_ALERT_ATTR_REC_VALUE);
recipients++;
- entry.envvars =
- crm_get_envvars_from_cib(recipient,
- entry.envvars,
+ crm_get_envvars_from_cib(recipient,
+ &entry,
&envvars_added);
{
crm_alert_entry_t recipient_entry = entry;
GHashTable *config_hash =
get_meta_attrs_from_cib(recipient,
&recipient_entry,
&max_timeout);
crm_add_dup_notify_list_entry(&recipient_entry);
crm_debug("Alert has recipient: id=%s, value=%s, "
"%d additional environment variables",
crm_element_value(recipient, XML_ATTR_ID),
recipient_entry.recipient, envvars_added);
g_hash_table_destroy(config_hash);
}
- entry.envvars =
- crm_drop_envvars(entry.envvars, envvars_added);
+ crm_drop_envvars(&entry, envvars_added);
}
if (recipients == 0) {
crm_add_dup_notify_list_entry(&entry);
}
- crm_drop_envvars(entry.envvars, -1);
+ crm_drop_envvars(&entry, -1);
g_hash_table_destroy(config_hash);
}
if (max_timeout > 0) {
crm_alert_max_alert_timeout = max_timeout;
}
}
/*
* end of synchronization of local data with cib
*/
void
crmd_enable_notifications(const char *script, const char *target)
{
free(notify_script);
notify_script = ((script) &&
(strcmp(script,"/dev/null")))?strdup(script):NULL;
free(notify_target);
notify_target = (target != NULL)?strdup(target):NULL;
}
static void
crmd_notify_complete(svc_action_t *op)
{
alerts_inflight--;
if(op->rc == 0) {
crm_info("Alert %d (%s) complete", op->sequence, op->agent);
} else {
crm_warn("Alert %d (%s) failed: %d", op->sequence, op->agent,
op->rc);
}
}
static void
send_notifications(const char *kind)
{
svc_action_t *notify = NULL;
static int operations = 0;
GListPtr l;
crm_time_hr_t *now = crm_time_hr_new(NULL);
crm_set_alert_key(CRM_alert_kind, kind);
crm_set_alert_key(CRM_alert_version, VERSION);
for (l = g_list_first(crm_alert_list); l; l = g_list_next(l)) {
crm_alert_entry_t *entry = (crm_alert_entry_t *)(l->data);
char *timestamp = crm_time_format_hr(entry->tstamp_format, now);
operations++;
if (!draining_alerts) {
crm_debug("Sending '%s' alert to '%s' via '%s'", kind,
entry->recipient, entry->path);
crm_set_alert_key(CRM_alert_recipient, entry->recipient);
crm_set_alert_key_int(CRM_alert_node_sequence, operations);
crm_set_alert_key(CRM_alert_timestamp, timestamp);
notify = services_action_create_generic(entry->path, NULL);
notify->timeout = entry->timeout;
notify->standard = strdup("event");
notify->id = strdup(entry->id);
notify->agent = strdup(entry->path);
notify->sequence = operations;
- crm_set_envvar_list(entry->envvars);
+ crm_set_envvar_list(entry);
alerts_inflight++;
if(services_action_async(notify, &crmd_notify_complete) == FALSE) {
services_action_free(notify);
alerts_inflight--;
}
- crm_unset_envvar_list(entry->envvars);
+ crm_unset_envvar_list(entry);
} else {
crm_warn("Ignoring '%s' alert to '%s' via '%s' received "
"while shutting down",
kind, entry->recipient, entry->path);
}
free(timestamp);
}
crm_unset_alert_keys();
if (now) {
free(now);
}
}
void
crmd_notify_node_event(crm_node_t *node)
{
if(!crm_alert_list) {
return;
}
crm_set_alert_key(CRM_alert_node, node->uname);
crm_set_alert_key_int(CRM_alert_nodeid, node->id);
crm_set_alert_key(CRM_alert_desc, node->state);
send_notifications("node");
}
void
crmd_notify_fencing_op(stonith_event_t * e)
{
char *desc = NULL;
if (!crm_alert_list) {
return;
}
desc = crm_strdup_printf(
"Operation %s of %s by %s for %s@%s: %s (ref=%s)",
e->action, e->target, e->executioner ? e->executioner : "<no-one>",
e->client_origin, e->origin, pcmk_strerror(e->result), e->id);
crm_set_alert_key(CRM_alert_node, e->target);
crm_set_alert_key(CRM_alert_task, e->operation);
crm_set_alert_key(CRM_alert_desc, desc);
crm_set_alert_key_int(CRM_alert_rc, e->result);
send_notifications("fencing");
free(desc);
}
void
crmd_notify_resource_op(const char *node, lrmd_event_data_t * op)
{
int target_rc = 0;
if(!crm_alert_list) {
return;
}
target_rc = rsc_op_expected_rc(op);
if(op->interval == 0 && target_rc == op->rc &&
safe_str_eq(op->op_type, RSC_STATUS)) {
/* Leave it up to the script if they want to notify for
* 'failed' probes, only swallow ones for which the result was
* unexpected.
*
* Even if we find a resource running, it was probably because
* someone erased the status section.
*/
return;
}
crm_set_alert_key(CRM_alert_node, node);
crm_set_alert_key(CRM_alert_rsc, op->rsc_id);
crm_set_alert_key(CRM_alert_task, op->op_type);
crm_set_alert_key_int(CRM_alert_interval, op->interval);
crm_set_alert_key_int(CRM_alert_target_rc, target_rc);
crm_set_alert_key_int(CRM_alert_status, op->op_status);
crm_set_alert_key_int(CRM_alert_rc, op->rc);
if(op->op_status == PCMK_LRM_OP_DONE) {
crm_set_alert_key(CRM_alert_desc, services_ocf_exitcode_str(op->rc));
} else {
crm_set_alert_key(CRM_alert_desc, services_lrm_status_str(op->op_status));
}
send_notifications("resource");
}
static gboolean
alert_drain_timeout_callback(gpointer user_data)
{
gboolean *timeout_popped = (gboolean *) user_data;
*timeout_popped = TRUE;
return FALSE;
}
void
crmd_drain_alerts(GMainContext *ctx)
{
guint timer;
gboolean timeout_popped = FALSE;
draining_alerts = TRUE;
timer = g_timeout_add(crm_alert_max_alert_timeout + 5000,
alert_drain_timeout_callback,
(gpointer) &timeout_popped);
while(alerts_inflight && !timeout_popped) {
crm_trace("Draining mainloop while still %d alerts are in flight (timeout=%dms)",
alerts_inflight, crm_alert_max_alert_timeout + 5000);
g_main_context_iteration(ctx, TRUE);
}
if (!timeout_popped && (timer > 0)) {
g_source_remove(timer);
}
}
diff --git a/include/crm/common/alerts_internal.h b/include/crm/common/alerts_internal.h
index eaaef2ad50..a069739c8b 100644
--- a/include/crm/common/alerts_internal.h
+++ b/include/crm/common/alerts_internal.h
@@ -1,66 +1,66 @@
/*
* Copyright (C) 2015 Andrew Beekhof <andrew@beekhof.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef ALERT_INTERNAL_H
#define ALERT_INTERNAL_H
/* Default-Timeout to use before killing a notification script (in milliseconds) */
# define CRM_ALERT_DEFAULT_TIMEOUT_MS (30000)
/* Default-Format-String used to pass timestamps to the notification scripts */
# define CRM_ALERT_DEFAULT_TSTAMP_FORMAT "%H:%M:%S.%06N"
typedef struct {
char *id;
char *path;
int timeout;
char *tstamp_format;
char *recipient;
GListPtr envvars;
} crm_alert_entry_t;
enum crm_alert_keys_e {
CRM_alert_recipient = 0,
CRM_alert_node,
CRM_alert_nodeid,
CRM_alert_rsc,
CRM_alert_task,
CRM_alert_interval,
CRM_alert_desc,
CRM_alert_status,
CRM_alert_target_rc,
CRM_alert_rc,
CRM_alert_kind,
CRM_alert_version,
CRM_alert_node_sequence,
CRM_alert_timestamp
};
extern GListPtr crm_alert_list;
extern guint crm_alert_max_alert_timeout;
extern const char *crm_alert_keys[14][3];
void crm_free_notify_list(void);
-GListPtr crm_drop_envvars(GListPtr envvar_list, int count);
+GListPtr crm_drop_envvars(crm_alert_entry_t *entry, int count);
void crm_add_dup_notify_list_entry(crm_alert_entry_t *entry);
-GListPtr crm_get_envvars_from_cib(xmlNode *basenode, GListPtr list, int *count);
+GListPtr crm_get_envvars_from_cib(xmlNode *basenode, crm_alert_entry_t *entry, int *count);
void crm_set_alert_key(enum crm_alert_keys_e name, const char *value);
void crm_set_alert_key_int(enum crm_alert_keys_e name, int value);
void crm_unset_alert_keys(void);
-void crm_set_envvar_list(GListPtr envvars);
-void crm_unset_envvar_list(GListPtr envvars);
+void crm_set_envvar_list(crm_alert_entry_t *entry);
+void crm_unset_envvar_list(crm_alert_entry_t *entry);
#endif
diff --git a/lib/common/alerts.c b/lib/common/alerts.c
index 3cf4bf7a0b..23c72e3073 100644
--- a/lib/common/alerts.c
+++ b/lib/common/alerts.c
@@ -1,262 +1,263 @@
/*
* Copyright (C) 2015 Andrew Beekhof <andrew@beekhof.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <crm_internal.h>
#include <crm/crm.h>
#include <crm/msg_xml.h>
#include <crm/common/alerts_internal.h>
typedef struct {
char *name;
char *value;
} envvar_t;
GListPtr crm_alert_list = NULL;
guint crm_alert_max_alert_timeout = CRM_ALERT_DEFAULT_TIMEOUT_MS;
/*
* to allow script compatibility we can have more than one
* set of environment variables
*/
const char *crm_alert_keys[14][3] =
{
[CRM_alert_recipient] = {"CRM_notify_recipient", "CRM_alert_recipient", NULL},
[CRM_alert_node] = {"CRM_notify_node", "CRM_alert_node", NULL},
[CRM_alert_nodeid] = {"CRM_notify_nodeid", "CRM_alert_nodeid", NULL},
[CRM_alert_rsc] = {"CRM_notify_rsc", "CRM_alert_rsc", NULL},
[CRM_alert_task] = {"CRM_notify_task", "CRM_alert_task", NULL},
[CRM_alert_interval] = {"CRM_notify_interval", "CRM_alert_interval", NULL},
[CRM_alert_desc] = {"CRM_notify_desc", "CRM_alert_desc", NULL},
[CRM_alert_status] = {"CRM_notify_status", "CRM_alert_status", NULL},
[CRM_alert_target_rc] = {"CRM_notify_target_rc", "CRM_alert_target_rc", NULL},
[CRM_alert_rc] = {"CRM_notify_rc", "CRM_alert_rc", NULL},
[CRM_alert_kind] = {"CRM_notify_kind", "CRM_alert_kind", NULL},
[CRM_alert_version] = {"CRM_notify_version", "CRM_alert_version", NULL},
[CRM_alert_node_sequence] = {"CRM_notify_node_sequence", "CRM_alert_node_sequence", NULL},
[CRM_alert_timestamp] = {"CRM_notify_timestamp", "CRM_alert_timestamp", NULL}
};
static void
free_envvar_entry(envvar_t *entry)
{
free(entry->name);
free(entry->value);
free(entry);
}
static void
crm_free_notify_list_entry(crm_alert_entry_t *entry)
{
free(entry->id);
free(entry->path);
free(entry->tstamp_format);
free(entry->recipient);
if (entry->envvars) {
g_list_free_full(entry->envvars,
(GDestroyNotify) free_envvar_entry);
}
free(entry);
}
void
crm_free_notify_list()
{
if (crm_alert_list) {
g_list_free_full(crm_alert_list, (GDestroyNotify) crm_free_notify_list_entry);
crm_alert_list = NULL;
}
}
static gpointer
copy_envvar_entry(envvar_t * src,
gpointer data)
{
envvar_t *dst = calloc(1, sizeof(envvar_t));
CRM_ASSERT(dst);
dst->name = strdup(src->name);
dst->value = src->value?strdup(src->value):NULL;
return (gpointer) dst;
}
static GListPtr
-add_dup_envvar(GListPtr envvar_list,
+add_dup_envvar(crm_alert_entry_t *entrys,
envvar_t *entry)
{
- return g_list_prepend(envvar_list, copy_envvar_entry(entry, NULL));
+ entrys->envvars = g_list_prepend(entrys->envvars, copy_envvar_entry(entry, NULL));
+ return entrys->envvars;
}
GListPtr
-crm_drop_envvars(GListPtr envvar_list, int count)
+crm_drop_envvars(crm_alert_entry_t *entry, int count)
{
int i;
for (i = 0;
- (envvar_list) && ((count < 0) || (i < count));
+ (entry->envvars) && ((count < 0) || (i < count));
i++) {
- free_envvar_entry((envvar_t *) g_list_first(envvar_list)->data);
- envvar_list = g_list_delete_link(envvar_list,
- g_list_first(envvar_list));
+ free_envvar_entry((envvar_t *) g_list_first(entry->envvars)->data);
+ entry->envvars = g_list_delete_link(entry->envvars,
+ g_list_first(entry->envvars));
}
- return envvar_list;
+ return entry->envvars;
}
static GListPtr
-copy_envvar_list_remove_dupes(GListPtr src)
+copy_envvar_list_remove_dupes(crm_alert_entry_t *entry)
{
GListPtr dst = NULL, ls, ld;
/* we are adding to the front so variable dupes coming via
* recipient-section have got precedence over those in the
* global section - we don't expect that many variables here
* that it pays off to go for a hash-table to make dupe elimination
* more efficient - maybe later when we might decide to do more
* with the variables than cycling through them
*/
- for (ls = g_list_first(src); ls; ls = g_list_next(ls)) {
+ for (ls = g_list_first(entry->envvars); ls; ls = g_list_next(ls)) {
for (ld = g_list_first(dst); ld; ld = g_list_next(ld)) {
if (!strcmp(((envvar_t *)(ls->data))->name,
((envvar_t *)(ld->data))->name)) {
break;
}
}
if (!ld) {
dst = g_list_prepend(dst,
copy_envvar_entry((envvar_t *)(ls->data), NULL));
}
}
return dst;
}
void
crm_add_dup_notify_list_entry(crm_alert_entry_t *entry)
{
crm_alert_entry_t *new_entry =
(crm_alert_entry_t *) calloc(1, sizeof(crm_alert_entry_t));
CRM_ASSERT(new_entry);
*new_entry = (crm_alert_entry_t) {
.id = strdup(entry->id),
.path = strdup(entry->path),
.timeout = entry->timeout,
.tstamp_format = entry->tstamp_format?strdup(entry->tstamp_format):NULL,
.recipient = entry->recipient?strdup(entry->recipient):NULL,
.envvars = entry->envvars?
- copy_envvar_list_remove_dupes(entry->envvars)
+ copy_envvar_list_remove_dupes(entry)
:NULL
};
crm_alert_list = g_list_prepend(crm_alert_list, new_entry);
}
GListPtr
-crm_get_envvars_from_cib(xmlNode *basenode, GListPtr list, int *count)
+crm_get_envvars_from_cib(xmlNode *basenode, crm_alert_entry_t *entry, int *count)
{
xmlNode *envvar;
xmlNode *pair;
if ((!basenode) ||
(!(envvar = first_named_child(basenode, XML_TAG_ATTR_SETS)))) {
- return list;
+ return entry->envvars;
}
for (pair = first_named_child(envvar, XML_CIB_TAG_NVPAIR);
pair; pair = __xml_next(pair)) {
envvar_t envvar_entry = (envvar_t) {
.name = (char *) crm_element_value(pair, XML_NVPAIR_ATTR_NAME),
.value = (char *) crm_element_value(pair, XML_NVPAIR_ATTR_VALUE)
};
crm_trace("Found environment variable %s = '%s'", envvar_entry.name,
envvar_entry.value?envvar_entry.value:"");
(*count)++;
- list = add_dup_envvar(list, &envvar_entry);
+ add_dup_envvar(entry, &envvar_entry);
}
- return list;
+ return entry->envvars;
}
void
crm_set_alert_key(enum crm_alert_keys_e name, const char *value)
{
const char **key;
for (key = crm_alert_keys[name]; *key; key++) {
crm_trace("Setting alert key %s = '%s'", *key, value);
if (value) {
setenv(*key, value, 1);
} else {
unsetenv(*key);
}
}
}
void
crm_set_alert_key_int(enum crm_alert_keys_e name, int value)
{
char *s = crm_itoa(value);
crm_set_alert_key(name, s);
free(s);
}
void
crm_unset_alert_keys()
{
const char **key;
enum crm_alert_keys_e name;
for(name = 0; name < DIMOF(crm_alert_keys); name++) {
for(key = crm_alert_keys[name]; *key; key++) {
crm_trace("Unsetting alert key %s", *key);
unsetenv(*key);
}
}
}
void
-crm_set_envvar_list(GListPtr envvars)
+crm_set_envvar_list(crm_alert_entry_t *entry)
{
GListPtr l;
- for (l = g_list_first(envvars); l; l = g_list_next(l)) {
- envvar_t *entry = (envvar_t *)(l->data);
+ for (l = g_list_first(entry->envvars); l; l = g_list_next(l)) {
+ envvar_t *env = (envvar_t *)(l->data);
- crm_trace("Setting environment variable %s = '%s'", entry->name,
- entry->value?entry->value:"");
- if (entry->value) {
- setenv(entry->name, entry->value, 1);
+ crm_trace("Setting environment variable %s = '%s'", env->name,
+ env->value?env->value:"");
+ if (env->value) {
+ setenv(env->name, env->value, 1);
} else {
- unsetenv(entry->name);
+ unsetenv(env->name);
}
}
}
void
-crm_unset_envvar_list(GListPtr envvars)
+crm_unset_envvar_list(crm_alert_entry_t *entry)
{
GListPtr l;
- for (l = g_list_first(envvars); l; l = g_list_next(l)) {
- envvar_t *entry = (envvar_t *)(l->data);
+ for (l = g_list_first(entry->envvars); l; l = g_list_next(l)) {
+ envvar_t *env = (envvar_t *)(l->data);
- crm_trace("Unsetting environment variable %s", entry->name);
- unsetenv(entry->name);
+ crm_trace("Unsetting environment variable %s", env->name);
+ unsetenv(env->name);
}
}