- (bal) Fixed dropped answer from skey_keyinfo() in auth1.c
 - (bal) Changed from --with-skey to --with-skey=PATH in configure.in
 - (bal) Added in check to verify S/Key library is being detected in
   configure.in
 - (bal) next-posix.h - added another prototype wrapped in POSIX ifdef/endif.
   Patch by Mark Miller <markm@swoon.net>
 - (bal) Added 'util.h' header to loginrec.c only if HAVE_UTIL_H is defined
   to remove warnings under MacOS X.  Patch by Mark Miller <markm@swoon.net>
 - (bal) Fixed LDFLAG mispelling in configure.in for --with-afs
This commit is contained in:
Ben Lindstrom 2000-11-10 02:41:30 +00:00
parent dbcea87063
commit 305fb0018a
5 changed files with 35 additions and 5 deletions

View File

@ -1,3 +1,14 @@
20001110
- (bal) Fixed dropped answer from skey_keyinfo() in auth1.c
- (bal) Changed from --with-skey to --with-skey=PATH in configure.in
- (bal) Added in check to verify S/Key library is being detected in
configure.in
- (bal) next-posix.h - added another prototype wrapped in POSIX ifdef/endif.
Patch by Mark Miller <markm@swoon.net>
- (bal) Added 'util.h' header to loginrec.c only if HAVE_UTIL_H is defined
to remove warnings under MacOS X. Patch by Mark Miller <markm@swoon.net>
- (bal) Fixed LDFLAG mispelling in configure.in for --with-afs
20001107
- (bal) acconfig.in - removed the double "USE_PIPES" entry. Patch by
Mark Miller <markm@swoon.net>

10
INSTALL
View File

@ -47,6 +47,12 @@ ftp://ftp.cus.cam.ac.uk/pub/software/programs/pcre/
Most platforms do not required this. However older 4.3 BSD do not
have a posix regex library.
S/Key Libraries:
http://www.sparc.spb.su/solaris/skey/
If you wish to use --with-skey then you will need the above library
installed. No other current S/Key library is currently known to be
supported. (If it fails to compile copy the sha1.h to the openssh directory
2. Building / Installation
--------------------------
@ -125,8 +131,8 @@ Kerberos IV and the AFS libraries and header files installed for this
to work. Use the optional PATH argument to specify the root of your
AFS installation. AFS requires Kerberos support to be enabled.
--with-skey will enable S/Key one time password support. You will need
the S/Key libraries and header files installed for this to work.
--with-skey=PATH will enable S/Key one time password support. You will
need the S/Key libraries and header files installed for this to work.
--with-tcp-wrappers will enable TCP Wrappers (/etc/hosts.allow|deny)
support. You will need libwrap.a and tcpd.h installed.

View File

@ -273,7 +273,7 @@ do_authloop(struct passwd * pw, char *luser)
if (options.skey_authentication == 1) {
char *skeyinfo = NULL;
if (pw != NULL)
skey_keyinfo(pw->pw_name);
skeyinfo = skey_keyinfo(pw->pw_name);
if (skeyinfo == NULL) {
debug("generating fake skeyinfo for %.100s.", luser);
skeyinfo = skey_fake_keyinfo(luser);

View File

@ -1085,7 +1085,7 @@ AC_ARG_WITH(afs,
if test "x$withval" != "xyes" ; then
CFLAGS="$CFLAGS -I${withval}/include"
LFLAGS="$LFLAGS -L${withval}/lib"
LDFLAGS="$LDFLAGS -L${withval}/lib"
fi
if test -z "$KRB4" ; then
@ -1106,12 +1106,24 @@ LIBS="$LIBS $KLIBS"
# Check whether user wants S/Key support
SKEY_MSG="no"
AC_ARG_WITH(skey,
[ --with-skey Enable S/Key support],
[ --with-skey=PATH Enable S/Key support],
[
if test "x$withval" != "xno" ; then
if test "x$withval" != "xyes" ; then
CFLAGS="$CFLAGS -I${withval}/include"
LDFLAGS="$LDFLAGS -L${withval}/lib"
fi
AC_DEFINE(SKEY)
LIBS="$LIBS -lskey"
SKEY_MSG="yes"
AC_CHECK_FUNC(skey_keyinfo,
[],
[
AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
])
fi
]
)

View File

@ -39,6 +39,7 @@ pid_t posix_wait(int *status);
/* #ifdef POSIX wrapped functions that need defining */
pid_t getppid(void);
void vhangup(void);
/* TERMCAP */
int tcgetattr(int fd, struct termios *t);