diff options
-rw-r--r-- | CREDITS | 1 | ||||
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | INSTALL | 15 | ||||
-rw-r--r-- | Makefile.in | 3 | ||||
-rw-r--r-- | configure.in | 50 |
5 files changed, 59 insertions, 15 deletions
@@ -13,6 +13,7 @@ Dan Brosemer <odin@linuxfreak.com> - Autoconf support, build fixes | |||
13 | Darren Hall <dhall@virage.org> - AIX patches | 13 | Darren Hall <dhall@virage.org> - AIX patches |
14 | David Agraz <dagraz@jahoopa.com> - Build fixes | 14 | David Agraz <dagraz@jahoopa.com> - Build fixes |
15 | David Rankin <drankin@bohemians.lexington.ky.us> - libwrap, NetBSD fixes | 15 | David Rankin <drankin@bohemians.lexington.ky.us> - libwrap, NetBSD fixes |
16 | Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE> - KRB4/AFS config patch | ||
16 | Jani Hakala <jahakala@cc.jyu.fi> - Patches | 17 | Jani Hakala <jahakala@cc.jyu.fi> - Patches |
17 | Jim Knoble <jmknoble@pobox.com> - Many patches | 18 | Jim Knoble <jmknoble@pobox.com> - Many patches |
18 | jonchen (email unknown) - the original author of PAM support of SSH | 19 | jonchen (email unknown) - the original author of PAM support of SSH |
@@ -1,3 +1,8 @@ | |||
1 | 20000106 | ||
2 | - Documentation update & cleanup | ||
3 | - Better KrbIV / AFS detection, based on patch from: | ||
4 | Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE> | ||
5 | |||
1 | 20000105 | 6 | 20000105 |
2 | - Fixed annoying DES corruption problem. libcrypt has been | 7 | - Fixed annoying DES corruption problem. libcrypt has been |
3 | overriding symbols in libcrypto. Removed libcrypt and crypt.h | 8 | overriding symbols in libcrypto. Removed libcrypt and crypt.h |
@@ -109,12 +109,15 @@ it if lastlog is installed in a different place. | |||
109 | 109 | ||
110 | --without-lastlog will disable lastlog support entirely. | 110 | --without-lastlog will disable lastlog support entirely. |
111 | 111 | ||
112 | --with-kerberos4 will enable Kerberos IV support. You will need to | 112 | --with-kerberos4=PATH will enable Kerberos IV support. You will need |
113 | have the Kerberos libraries and header files installed for this to | 113 | to have the Kerberos libraries and header files installed for this |
114 | work. | 114 | to work. Use the optional PATH argument to specify the root of your |
115 | 115 | Kerberos installation. | |
116 | --with-afs will enable AFS support. You will need to have the Kerberos | 116 | |
117 | IV and the AFS libraries and header files installed for this to work. | 117 | --with-afs=PATH will enable AFS support. You will need to have the |
118 | Kerberos IV and the AFS libraries and header files installed for this | ||
119 | to work. Use the optional PATH argument to specify the root of your | ||
120 | AFS installation. AFS requires Kerberos support to be enabled. | ||
118 | 121 | ||
119 | --with-skey will enable S/Key one time password support. You will need | 122 | --with-skey will enable S/Key one time password support. You will need |
120 | the S/Key libraries and header files installed for this to work. | 123 | the S/Key libraries and header files installed for this to work. |
diff --git a/Makefile.in b/Makefile.in index d04d22de2..23f005822 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -21,7 +21,6 @@ CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ | |||
21 | EXTRA_TARGETS=@GNOME_ASKPASS@ | 21 | EXTRA_TARGETS=@GNOME_ASKPASS@ |
22 | TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS) | 22 | TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS) |
23 | LIBS=@LIBS@ | 23 | LIBS=@LIBS@ |
24 | LIBWRAP=@LIBWRAP@ | ||
25 | AR=@AR@ | 24 | AR=@AR@ |
26 | RANLIB=@RANLIB@ | 25 | RANLIB=@RANLIB@ |
27 | INSTALL=@INSTALL@ | 26 | INSTALL=@INSTALL@ |
@@ -72,7 +71,7 @@ ssh: $(SSHOBJS) libssh.a | |||
72 | $(CC) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh $(LIBS) | 71 | $(CC) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh $(LIBS) |
73 | 72 | ||
74 | sshd: $(SSHDOBJS) libssh.a | 73 | sshd: $(SSHDOBJS) libssh.a |
75 | $(CC) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh $(LIBS) $(LIBWRAP) | 74 | $(CC) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh $(LIBS) |
76 | 75 | ||
77 | scp: scp.o libssh.a | 76 | scp: scp.o libssh.a |
78 | $(CC) -o $@ scp.o $(LDFLAGS) -lssh $(LIBS) | 77 | $(CC) -o $@ scp.o $(LDFLAGS) -lssh $(LIBS) |
diff --git a/configure.in b/configure.in index 7480349a2..127cd055e 100644 --- a/configure.in +++ b/configure.in | |||
@@ -52,6 +52,7 @@ case "$host" in | |||
52 | AC_MSG_RESULT(yes) | 52 | AC_MSG_RESULT(yes) |
53 | AC_DEFINE(HAVE_HPUX_TRUSTED_SYSTEM_PW) | 53 | AC_DEFINE(HAVE_HPUX_TRUSTED_SYSTEM_PW) |
54 | LIBS="$LIBS -lsec" | 54 | LIBS="$LIBS -lsec" |
55 | AC_MSG_WARN([This configuration is untested]) | ||
55 | else | 56 | else |
56 | AC_MSG_RESULT(no) | 57 | AC_MSG_RESULT(no) |
57 | AC_DEFINE(DISABLE_SHADOW) | 58 | AC_DEFINE(DISABLE_SHADOW) |
@@ -60,6 +61,9 @@ case "$host" in | |||
60 | *-*-solaris*) | 61 | *-*-solaris*) |
61 | AC_DEFINE(USE_UTMPX) | 62 | AC_DEFINE(USE_UTMPX) |
62 | ;; | 63 | ;; |
64 | *-*-aix*) | ||
65 | AFS_LIBS="-lld" | ||
66 | ;; | ||
63 | *-*-irix5*) | 67 | *-*-irix5*) |
64 | no_libsocket=1 | 68 | no_libsocket=1 |
65 | no_libnsl=1 | 69 | no_libnsl=1 |
@@ -400,23 +404,56 @@ AC_TRY_LINK([], | |||
400 | 404 | ||
401 | dnl Check whether user wants Kerberos support | 405 | dnl Check whether user wants Kerberos support |
402 | AC_ARG_WITH(kerberos4, | 406 | AC_ARG_WITH(kerberos4, |
403 | [ --with-kerberos4 Enable Kerberos 4 support], | 407 | [ --with-kerberos4=PATH Enable Kerberos 4 support], |
404 | [ | 408 | [ |
405 | if test "x$withval" != "$xno" ; then | 409 | if test "x$withval" != "$xno" ; then |
410 | |||
411 | if test "x$withval" != "$xyes" ; then | ||
412 | CFLAGS="$CFLAGS -I${withval}/include" | ||
413 | LDFLAGS="$LDFLAGS -L${withval}/lib" | ||
414 | else | ||
415 | if test -d /usr/include/kerberosIV ; then | ||
416 | CFLAGS="$CFLAGS -I/usr/include/kerberosIV" | ||
417 | fi | ||
418 | fi | ||
419 | |||
420 | AC_CHECK_HEADERS(krb.h) | ||
421 | AC_CHECK_LIB(krb, main) | ||
422 | if test "$ac_cv_header_krb_h" != yes; then | ||
423 | AC_MSG_WARN([Cannot find krb.h, build may fail]) | ||
424 | fi | ||
425 | if test "$ac_cv_lib_krb_main" != yes; then | ||
426 | AC_MSG_WARN([Cannot find libkrb, build may fail]) | ||
427 | fi | ||
428 | |||
429 | LIBS="$LIBS -lkrb -ldes" | ||
430 | AC_CHECK_LIB(resolv, dn_expand, , ) | ||
431 | KRB4=yes | ||
406 | AC_DEFINE(KRB4) | 432 | AC_DEFINE(KRB4) |
407 | LIBS="$LIBS -lkrb" | ||
408 | CFLAGS="$CFLAGS -I/usr/include/kerberosIV" | ||
409 | fi | 433 | fi |
410 | ] | 434 | ] |
411 | ) | 435 | ) |
412 | 436 | ||
413 | dnl Check whether user wants AFS support | 437 | dnl Check whether user wants AFS support |
414 | AC_ARG_WITH(afs, | 438 | AC_ARG_WITH(afs, |
415 | [ --with-afs Enable AFS support], | 439 | [ --with-afs=PATH Enable AFS support], |
416 | [ | 440 | [ |
417 | if test "x$withval" != "$xno" ; then | 441 | if test "x$withval" != "$xno" ; then |
418 | AC_DEFINE(AFS) | 442 | |
443 | if test "x$withval" != "$xyes" ; then | ||
444 | CFLAGS="$CFLAGS -I${withval}/include" | ||
445 | LFLAGS="$LFLAGS -L${withval}/lib" | ||
446 | fi | ||
447 | |||
448 | if test -z "$KRB4" ; then | ||
449 | AC_MSG_WARN([AFS requires Kerberos IV support, build may fail]) | ||
450 | fi | ||
451 | |||
419 | LIBS="$LIBS -lkafs" | 452 | LIBS="$LIBS -lkafs" |
453 | if test ! -z "$AFS_LIBS" ; then | ||
454 | LIBS="$LIBS $AFS_LIBS" | ||
455 | fi | ||
456 | AC_DEFINE(AFS) | ||
420 | fi | 457 | fi |
421 | ] | 458 | ] |
422 | ) | 459 | ) |
@@ -438,11 +475,10 @@ AC_ARG_WITH(tcp-wrappers, | |||
438 | [ | 475 | [ |
439 | if test "x$withval" != "$xno" ; then | 476 | if test "x$withval" != "$xno" ; then |
440 | AC_DEFINE(LIBWRAP) | 477 | AC_DEFINE(LIBWRAP) |
441 | LIBWRAP="-lwrap" | 478 | LIBS="$LIBS -lwrap" |
442 | fi | 479 | fi |
443 | ] | 480 | ] |
444 | ) | 481 | ) |
445 | AC_SUBST(LIBWRAP) | ||
446 | 482 | ||
447 | dnl Check whether to enable MD5 passwords | 483 | dnl Check whether to enable MD5 passwords |
448 | AC_ARG_WITH(md5-passwords, | 484 | AC_ARG_WITH(md5-passwords, |