From b3a710d4dd54daa8ef5de121b9175eb2c52de22f Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 19 Apr 2000 07:05:48 +0000 Subject: [PATCH] pid_t --- usr.bin/ssh/clientloop.c | 5 +++-- usr.bin/ssh/login.c | 6 +++--- usr.bin/ssh/serverloop.c | 10 ++++++---- usr.bin/ssh/ssh-agent.c | 9 +++++---- usr.bin/ssh/ssh.h | 8 ++++---- usr.bin/ssh/sshconnect.c | 4 ++-- usr.bin/ssh/sshd.c | 5 +++-- 7 files changed, 26 insertions(+), 21 deletions(-) diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index 61872397bce..b77a6895a5b 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/clientloop.c @@ -16,7 +16,7 @@ */ #include "includes.h" -RCSID("$Id: clientloop.c,v 1.20 2000/04/14 10:30:30 markus Exp $"); +RCSID("$Id: clientloop.c,v 1.21 2000/04/19 07:05:48 deraadt Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -471,7 +471,8 @@ client_process_net_input(fd_set * readset) void client_process_input(fd_set * readset) { - int len, pid; + int len; + pid_t pid; char buf[8192], *s; /* Read input from stdin. */ diff --git a/usr.bin/ssh/login.c b/usr.bin/ssh/login.c index 5669c46d474..8e40784e2cb 100644 --- a/usr.bin/ssh/login.c +++ b/usr.bin/ssh/login.c @@ -18,7 +18,7 @@ */ #include "includes.h" -RCSID("$Id: login.c,v 1.12 2000/04/14 10:30:31 markus Exp $"); +RCSID("$Id: login.c,v 1.13 2000/04/19 07:05:49 deraadt Exp $"); #include #include @@ -68,7 +68,7 @@ get_last_login_time(uid_t uid, const char *logname, */ void -record_login(int pid, const char *ttyname, const char *user, uid_t uid, +record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid, const char *host, struct sockaddr * addr) { int fd; @@ -116,7 +116,7 @@ record_login(int pid, const char *ttyname, const char *user, uid_t uid, /* Records that the user has logged out. */ void -record_logout(int pid, const char *ttyname) +record_logout(pid_t pid, const char *ttyname) { const char *line = ttyname + 5; /* /dev/ttyq8 -> ttyq8 */ if (logout(line)) diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index b482c228ef4..93c33534d08 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -48,7 +48,7 @@ static int max_fd; /* Max file descriptor number for select(). */ * will exit after that, as soon as forwarded connections have terminated. */ -static int child_pid; /* Pid of the child. */ +static pid_t child_pid; /* Pid of the child. */ static volatile int child_terminated; /* The child has terminated. */ static volatile int child_wait_status; /* Status from wait(). */ @@ -58,7 +58,8 @@ void sigchld_handler(int sig) { int save_errno = errno; - int wait_pid; + pid_t wait_pid; + debug("Received SIGCHLD."); wait_pid = wait((int *) &child_wait_status); if (wait_pid != -1) { @@ -364,9 +365,10 @@ process_buffered_input_packets() * child program). */ void -server_loop(int pid, int fdin_arg, int fdout_arg, int fderr_arg) +server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg) { - int wait_status, wait_pid; /* Status and pid returned by wait(). */ + int wait_status; /* Status returned by wait(). */ + pid_t wait_pid; /* pid returned by wait(). */ int waiting_termination = 0; /* Have displayed waiting close message. */ unsigned int max_time_milliseconds; unsigned int previous_stdout_buffer_bytes; diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index d5608c5e75d..39ff3e533e6 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.28 2000/04/14 10:30:33 markus Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.29 2000/04/19 07:05:49 deraadt Exp $ */ /* * Author: Tatu Ylonen @@ -9,7 +9,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-agent.c,v 1.28 2000/04/14 10:30:33 markus Exp $"); +RCSID("$OpenBSD: ssh-agent.c,v 1.29 2000/04/19 07:05:49 deraadt Exp $"); #include "ssh.h" #include "rsa.h" @@ -46,7 +46,7 @@ Identity *identities = NULL; int max_fd = 0; /* pid of shell == parent of agent */ -int parent_pid = -1; +pid_t parent_pid = -1; /* pathname and directory for AUTH_SOCKET */ char socket_name[1024]; @@ -460,7 +460,7 @@ after_select(fd_set *readset, fd_set *writeset) void check_parent_exists(int sig) { - if (kill(parent_pid, 0) < 0) { + if (parent_pid != -1 && kill(parent_pid, 0) < 0) { /* printf("Parent has died - Authentication agent exiting.\n"); */ exit(1); } @@ -546,6 +546,7 @@ main(int ac, char **av) } pid = atoi(pidstr); if (pid < 1) { /* XXX PID_MAX check too */ + /* Yes, PID_MAX check please */ fprintf(stderr, "%s=\"%s\", which is not a good PID\n", SSH_AGENTPID_ENV_NAME, pidstr); exit(1); diff --git a/usr.bin/ssh/ssh.h b/usr.bin/ssh/ssh.h index 12cd6b84e00..5e53b34b1e0 100644 --- a/usr.bin/ssh/ssh.h +++ b/usr.bin/ssh/ssh.h @@ -13,7 +13,7 @@ * */ -/* RCSID("$Id: ssh.h,v 1.38 2000/04/14 10:30:33 markus Exp $"); */ +/* RCSID("$Id: ssh.h,v 1.39 2000/04/19 07:05:49 deraadt Exp $"); */ #ifndef SSH_H #define SSH_H @@ -263,14 +263,14 @@ get_last_login_time(uid_t uid, const char *logname, * by login(1). */ void -record_login(int pid, const char *ttyname, const char *user, uid_t uid, +record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid, const char *host, struct sockaddr *addr); /* * Records that the user has logged out. This does many thigs normally done * by login(1) or init. */ -void record_logout(int pid, const char *ttyname); +void record_logout(pid_t pid, const char *ttyname); /*------------ definitions for sshconnect.c ----------*/ @@ -479,7 +479,7 @@ char *tilde_expand_filename(const char *filename, uid_t my_uid); * (of the child program), and reads from stdout and stderr (of the child * program). */ -void server_loop(int pid, int fdin, int fdout, int fderr); +void server_loop(pid_t pid, int fdin, int fdout, int fderr); void server_loop2(void); /* Client side main loop for the interactive session. */ diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 4e39eab45cc..82c8b5c2179 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.68 2000/04/14 10:30:33 markus Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.69 2000/04/19 07:05:50 deraadt Exp $"); #include #include "xmalloc.h" @@ -62,7 +62,7 @@ ssh_proxy_connect(const char *host, u_short port, uid_t original_real_uid, const char *cp; char *command_string; int pin[2], pout[2]; - int pid; + pid_t pid; char strport[NI_MAXSERV]; /* Convert the port number into a string. */ diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index beaecc975b6..b13347d83c4 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.106 2000/04/17 12:31:47 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.107 2000/04/19 07:05:50 deraadt Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -392,7 +392,8 @@ main(int ac, char **av) { extern char *optarg; extern int optind; - int opt, sock_in = 0, sock_out = 0, newsock, i, fdsetsz, pid, on = 1; + int opt, sock_in = 0, sock_out = 0, newsock, i, fdsetsz, on = 1; + pid_t pid; socklen_t fromlen; int silentrsa = 0; fd_set *fdset; -- 2.20.1