From 7e4314eccbc9dd36340e6ca3d0eccfc7e678b219 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sun, 6 Oct 2013 00:02:52 +0100 Subject: Remove CMD_SENDENVIRON. --- client.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'client.c') diff --git a/client.c b/client.c index b9e3b30a..bb1b34cf 100644 --- a/client.c +++ b/client.c @@ -179,7 +179,7 @@ client_main(int argc, char **argv, int flags) cmdflags = CMD_STARTSERVER; } else if (argc == 0) { msg = MSG_COMMAND; - cmdflags = CMD_STARTSERVER|CMD_SENDENVIRON|CMD_CANTNEST; + cmdflags = CMD_STARTSERVER|CMD_CANTNEST; } else { msg = MSG_COMMAND; @@ -197,8 +197,6 @@ client_main(int argc, char **argv, int flags) TAILQ_FOREACH(cmd, &cmdlist->list, qentry) { if (cmd->entry->flags & CMD_STARTSERVER) cmdflags |= CMD_STARTSERVER; - if (cmd->entry->flags & CMD_SENDENVIRON) - cmdflags |= CMD_SENDENVIRON; if (cmd->entry->flags & CMD_CANTNEST) cmdflags |= CMD_CANTNEST; } @@ -262,8 +260,7 @@ client_main(int argc, char **argv, int flags) set_signals(client_signal); /* Send initial environment. */ - if (cmdflags & CMD_SENDENVIRON) - client_send_environ(); + client_send_environ(); client_send_identify(flags); /* Send first command. */ -- cgit