RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Fix linking of sftp, don't need arc4random any more. 

- (djm) Try to use shell that supports "test -S" for EGD socket search.
   Based on patch from Tim Rice <tim@multitalents.net>
This commit is contained in:
Damien Miller 2001-02-08 10:07:08 +11:00
parent 3d0a7d59cb
commit 4864e8f9c0
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,6 +1,9 @@
20010208 20010208
- (djm) Don't delete external askpass program in make uninstall target. - (djm) Don't delete external askpass program in make uninstall target.
Report and fix from Roumen Petrov <roumen.petrov@skalasoft.com> Report and fix from Roumen Petrov <roumen.petrov@skalasoft.com>
- (djm) Fix linking of sftp, don't need arc4random any more.
- (djm) Try to use shell that supports "test -S" for EGD socket search.
Based on patch from Tim Rice <tim@multitalents.net>
20010207 20010207
- (bal) Save the whole path to AR in configure. Some Solaris 2.7 installs - (bal) Save the whole path to AR in configure. Some Solaris 2.7 installs

5
Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.148 2001/02/07 21:22:47 djm Exp $ # $Id: Makefile.in,v 1.149 2001/02/07 23:07:09 djm Exp $
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
@ -110,9 +110,8 @@ ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a log-client.o ssh-keyscan.o
sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp-server.o sftp-common.o log-server.o sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp-server.o sftp-common.o log-server.o
$(LD) -o $@ sftp-server.o sftp-common.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LD) -o $@ sftp-server.o sftp-common.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
# XXX: need to -lssh twice here!
sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o log-client.o sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o log-client.o
$(LD) -o $@ sftp.o sftp-client.o sftp-common.o sftp-int.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) $(LD) -o $@ sftp.o sftp-client.o sftp-common.o sftp-int.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
# test driver for the loginrec code - not built by default # test driver for the loginrec code - not built by default
logintest: logintest.o $(LIBCOMPAT) libssh.a log-client.o loginrec.o logintest: logintest.o $(LIBCOMPAT) libssh.a log-client.o loginrec.o

13
configure.in
View File

@ -14,6 +14,9 @@ AC_SUBST(PERL)
AC_PATH_PROG(ENT, ent) AC_PATH_PROG(ENT, ent)
AC_SUBST(ENT) AC_SUBST(ENT)
AC_PATH_PROGS(FILEPRIV, filepriv, true, /sbin:/usr/sbin) AC_PATH_PROGS(FILEPRIV, filepriv, true, /sbin:/usr/sbin)
AC_PATH_PROG(TEST_MINUS_S_SH, bash)
AC_PATH_PROG(TEST_MINUS_S_SH, ksh)
AC_PATH_PROG(TEST_MINUS_S_SH, sh)
if test -z "$AR" ; then if test -z "$AR" ; then
AC_MSG_ERROR([*** 'ar' missing, please install or fix your \$PATH ***]) AC_MSG_ERROR([*** 'ar' missing, please install or fix your \$PATH ***])
@ -1079,14 +1082,18 @@ AC_ARG_WITH(egd-pool,
if test -z "$RANDOM_POOL" ; then if test -z "$RANDOM_POOL" ; then
AC_MSG_CHECKING(for PRNGD/EGD socket) AC_MSG_CHECKING(for PRNGD/EGD socket)
# Insert other locations here # Insert other locations here
for egdsock in /var/run/egd-pool /etc/entropy ; do for egdsock in /var/run/egd-pool /etc/entropy /tmp/entropy ; do
if test -S $egdsock ; then if $TEST_MINUS_S_SH -c "test -S $egdsock -o -p $egdsock" ; then
EGD_SOCKET="$egdsock" EGD_SOCKET="$egdsock"
AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET") AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")
AC_MSG_RESULT($egdsock)
break; break;
fi fi
done done
if test -x "$EGD_SOCKET" ; then
AC_MSG_RESULT($EGD_SOCKET)
else
AC_MSG_RESULT(not found)
fi
fi fi
] ]
) )