empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix redirections with execute. Redirection consumed the remembered

Browse source 
input, and execute couldn't find it and mistakenly raised the
tampering deity alarm.  Closes #804644:
(saved_bytes): New.
(save_input): Set it.
(forget_input): New.
(seen_input): Don't discard, return a value for forget_input().
(save_input): Return a value for forget_input(), just because it makes
sense.
(input_to_forget, redir_authorized, prompt): Save value of
seen_input() to new input_to_forget in redir_authorized(), pass it to
forget_input() in prompt().
This commit is contained in:
Markus Armbruster 2007-11-18 09:41:59 +00:00
parent 72b01c8ba1
commit 02a9af06a0
3 changed files with 54 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/client/servcmd.c
View file

@ -31,6 +31,7 @@
* Dave Pare, 1989
* Steve McClure, 1998
* Ron Koenderink, 2005
* Markus Armbruster, 2005-2007
*/
#include <config.h>
@ -50,6 +51,7 @@ FILE *auxfp;
static FILE *redir_fp;
static FILE *pipe_fp;
static size_t input_to_forget;
static void prompt(int, char *, char *);
static void doredir(char *p);
@ -124,7 +126,12 @@ prompt(int code, char *prompt, char *teles)
(void)pclose(pipe_fp);
pipe_fp = NULL;
}
if (input_to_forget) {
forget_input(input_to_forget);
input_to_forget = 0;
}
}
nl = code == C_PROMPT || code == C_INFORM ? "\n" : "";
printf("%s%s%s", nl, teles, prompt);
fflush(stdout);
@ -148,11 +155,14 @@ fname(char *s)
static int
redir_authorized(char *arg, char *attempt)
{
if (!seen_input(arg)) {
size_t seen = seen_input(arg);
if (!seen || (input_to_forget && input_to_forget != seen)) {
fprintf(stderr, "WARNING! Server attempted to %s %s\n",
attempt, arg);
return 0;
}
input_to_forget = seen;
return 1;
}