summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2000-11-05 21:13:45 +0000
committerBen Lindstrom <mouring@eviladmin.org>2000-11-05 21:13:45 +0000
commite4c82b57b2f6bef8f13a2aa3956da10dddfc6651 (patch)
tree3bd3cf30daabaaab66a8a1b3a3e888fa970a81c0
parent85b3db6bcabfd6fd3fd97c871f4e29053a3338f3 (diff)
- (bal) Missed auth-skey.o in Makefile.in and minor correction to
bsd-waitpid.c
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in2
-rw-r--r--bsd-waitpid.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bf698596..912dbe9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
- (bal) Reworked NEWS-OS and NeXT ports to extract waitpid() and
setsid() into more common files
- (stevesk) pty.c: use __hpux to identify HP-UX.
+ - (bal) Missed auth-skey.o in Makefile.in and minor correction to
+ bsd-waitpid.c
20001029
- (stevesk) Fix typo in auth.c: USE_PAM not PAM
diff --git a/Makefile.in b/Makefile.in
index c03b46cb..d0d8ba93 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
SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o
-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
+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
TROFFMAN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8 sftp-server.8
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 fb17063a..0bf4c7cd 100644
--- a/bsd-waitpid.c
+++ b/bsd-waitpid.c
@@ -25,7 +25,7 @@
#ifndef HAVE_WAITPID
#include <errno.h>
#include <sys/wait.h>
-#include <bsd-waitpid.h>
+#include "bsd-waitpid.h"
pid_t
waitpid(int pid, int *stat_loc, int options)