diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | bsd-waitpid.c | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -11,6 +11,8 @@ | |||
11 | - (bal) Reworked NEWS-OS and NeXT ports to extract waitpid() and | 11 | - (bal) Reworked NEWS-OS and NeXT ports to extract waitpid() and |
12 | setsid() into more common files | 12 | setsid() into more common files |
13 | - (stevesk) pty.c: use __hpux to identify HP-UX. | 13 | - (stevesk) pty.c: use __hpux to identify HP-UX. |
14 | - (bal) Missed auth-skey.o in Makefile.in and minor correction to | ||
15 | bsd-waitpid.c | ||
14 | 16 | ||
15 | 20001029 | 17 | 20001029 |
16 | - (stevesk) Fix typo in auth.c: USE_PAM not PAM | 18 | - (stevesk) Fix typo in auth.c: USE_PAM not PAM |
diff --git a/Makefile.in b/Makefile.in index c03b46cb8..d0d8ba936 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -41,7 +41,7 @@ LIBOPENBSD_COMPAT_OBJS=bsd-arc4random.o bsd-base64.o bsd-bindresvport.o bsd-daem | |||
41 | 41 | ||
42 | SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o | 42 | SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o |
43 | 43 | ||
44 | SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth2-skey.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o dh.o pty.o log-server.o login.o loginrec.o servconf.o serverloop.o md5crypt.o session.o | 44 | SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-skey.o auth2-skey.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o dh.o pty.o log-server.o login.o loginrec.o servconf.o serverloop.o md5crypt.o session.o |
45 | 45 | ||
46 | TROFFMAN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8 sftp-server.8 | 46 | TROFFMAN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8 sftp-server.8 |
47 | CATMAN = scp.0 ssh-add.0 ssh-agent.0 ssh-keygen.0 ssh.0 sshd.0 sftp-server.0 | 47 | CATMAN = scp.0 ssh-add.0 ssh-agent.0 ssh-keygen.0 ssh.0 sshd.0 sftp-server.0 |
diff --git a/bsd-waitpid.c b/bsd-waitpid.c index fb17063a5..0bf4c7cd8 100644 --- a/bsd-waitpid.c +++ b/bsd-waitpid.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #ifndef HAVE_WAITPID | 25 | #ifndef HAVE_WAITPID |
26 | #include <errno.h> | 26 | #include <errno.h> |
27 | #include <sys/wait.h> | 27 | #include <sys/wait.h> |
28 | #include <bsd-waitpid.h> | 28 | #include "bsd-waitpid.h" |
29 | 29 | ||
30 | pid_t | 30 | pid_t |
31 | waitpid(int pid, int *stat_loc, int options) | 31 | waitpid(int pid, int *stat_loc, int options) |