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

pass errsock status to init_ivecs

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14239 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2004-09-21 11:34:43 +00:00
parent af952334df
commit e5b80c785f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appl/rsh/rshd.c
View File

@@ -459,7 +459,8 @@ recv_krb5_auth (int s, u_char *buf,
static void static void
loop (int from0, int to0, loop (int from0, int to0,
int to1, int from1, int to1, int from1,
int to2, int from2) int to2, int from2,
int have_errsock)
{ {
fd_set real_readset; fd_set real_readset;
int max_fd; int max_fd;
@@ -470,7 +471,7 @@ loop (int from0, int to0,
#ifdef KRB5 #ifdef KRB5
if(auth_method == AUTH_KRB5 && protocol_version == 2) if(auth_method == AUTH_KRB5 && protocol_version == 2)
init_ivecs(0); init_ivecs(0, have_errsock);
#endif #endif
FD_ZERO(&real_readset); FD_ZERO(&real_readset);
@@ -551,7 +552,7 @@ pipe_a_like (int fd[2])
* Start a child process and leave the parent copying data to and from it. */ * Start a child process and leave the parent copying data to and from it. */
static void static void
setup_copier (void) setup_copier (int have_errsock)
{ {
int p0[2], p1[2], p2[2]; int p0[2], p1[2], p2[2];
pid_t pid; pid_t pid;
@@ -582,7 +583,8 @@ setup_copier (void)
loop (STDIN_FILENO, p0[1], loop (STDIN_FILENO, p0[1],
STDOUT_FILENO, p1[0], STDOUT_FILENO, p1[0],
STDERR_FILENO, p2[0]); STDERR_FILENO, p2[0],
have_errsock);
} }
} }
@@ -864,7 +866,7 @@ doit (void)
setup_environment (&env, pwd); setup_environment (&env, pwd);
if (do_encrypt) { if (do_encrypt) {
setup_copier (); setup_copier (errsock >= 0);
} else { } else {
if (net_write (s, "", 1) != 1) if (net_write (s, "", 1) != 1)
fatal (s, "net_write", "write failed"); fatal (s, "net_write", "write failed");