oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(setup_copier): use socketpair' instead of pipe'. Some shells don't

Browse Source 
think it's a rsh session if they find a pipe at the other end.
(setup_environment): add SSH_CLIENT just to make bash happy


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5908 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-04-10 15:32:50 +00:00
parent 8de0cc5aff
commit 1d62e5795e
1 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
appl/rsh/rshd.c
View File

@@ -399,18 +399,35 @@ loop (int from0, int to0,
} }
} }
/*
* Used by `setup_copier' to create some pipe-like means of
* communcation. Real pipes would probably be the best thing, but
* then the shell doesn't understand it's talking to rshd. If
* socketpair doesn't work everywhere, some autoconf magic would have
* to be added here.
*
* If it fails creating the `pipe', it aborts by calling fatal.
*/
static void
pipe_a_like (int fd[2])
{
if (socketpair (AF_UNIX, SOCK_STREAM, 0, fd) < 0)
fatal (STDOUT_FILENO, "socketpair: %m");
}
/*
* Start a child process and leave the parent copying data to and from it. */
static void static void
setup_copier (void) setup_copier (void)
{ {
int p0[2], p1[2], p2[2]; int p0[2], p1[2], p2[2];
pid_t pid; pid_t pid;
if (pipe(p0) < 0) pipe_a_like(p0);
fatal (STDOUT_FILENO, "pipe: %m"); pipe_a_like(p1);
if (pipe(p1) < 0) pipe_a_like(p2);
fatal (STDOUT_FILENO, "pipe: %m");
if (pipe(p2) < 0)
fatal (STDOUT_FILENO, "pipe: %m");
pid = fork (); pid = fork ();
if (pid < 0) if (pid < 0)
fatal (STDOUT_FILENO, "fork: %m"); fatal (STDOUT_FILENO, "fork: %m");
@@ -424,7 +441,7 @@ setup_copier (void)
close (p0[0]); close (p0[0]);
close (p1[1]); close (p1[1]);
close (p2[1]); close (p2[1]);
} else { } else { /* parent */
close (p0[0]); close (p0[0]);
close (p1[1]); close (p1[1]);
close (p2[1]); close (p2[1]);
@@ -438,12 +455,31 @@ setup_copier (void)
} }
} }
/*
* Is `port' a ``reserverd'' port?
*/
static int static int
is_reserved(u_short port) is_reserved(u_short port)
{ {
return ntohs(port) < IPPORT_RESERVED; return ntohs(port) < IPPORT_RESERVED;
} }
/*
* Set the necessary part of the environment in `env'.
*/
static void
setup_environment (char *env[6], struct passwd *pwd)
{
asprintf (&env[0], "USER=%s", pwd->pw_name);
asprintf (&env[1], "HOME=%s", pwd->pw_dir);
asprintf (&env[2], "SHELL=%s", pwd->pw_shell);
asprintf (&env[3], "PATH=%s", _PATH_DEFPATH);
asprintf (&env[4], "SSH_CLIENT=only_to_make_bash_happy");
env[5] = NULL;
}
static void static void
doit (int do_kerberos, int check_rhosts) doit (int do_kerberos, int check_rhosts)
{ {
@@ -457,7 +493,7 @@ doit (int do_kerberos, int check_rhosts)
char cmd[COMMAND_SZ]; char cmd[COMMAND_SZ];
struct passwd *pwd; struct passwd *pwd;
int s = STDIN_FILENO; int s = STDIN_FILENO;
char *env[5]; char *env[6];
addrlen = sizeof(thisaddr); addrlen = sizeof(thisaddr);
if (getsockname (s, (struct sockaddr *)&thisaddr, &addrlen) < 0 if (getsockname (s, (struct sockaddr *)&thisaddr, &addrlen) < 0
@@ -577,11 +613,7 @@ doit (int do_kerberos, int check_rhosts)
close (errsock); close (errsock);
} }
asprintf (&env[0], "USER=%s", pwd->pw_name); setup_environment (env, pwd);
asprintf (&env[1], "HOME=%s", pwd->pw_dir);
asprintf (&env[2], "SHELL=%s", pwd->pw_shell);
asprintf (&env[3], "PATH=%s", _PATH_DEFPATH);
env[4] = NULL;
if (do_encrypt) { if (do_encrypt) {
setup_copier (); setup_copier ();