[955] in Kerberos-V5-bugs
appl/telnet configure.in changes
daemon@ATHENA.MIT.EDU (epeisach@MIT.EDU)
Fri Nov 11 11:34:35 1994
From: epeisach@MIT.EDU
Date: Fri, 11 Nov 1994 11:34:30 -0500
To: krb5-bugs@MIT.EDU
For description, all file names are rooted at appl/telnet
./configure.in: WITH_CCOPTS is required to set CCOPTS in case someone
types make fomr the appl/telnet subdir. (ccopts is passed down)
libtelnet/configure.in - krb4 suppor (see note)
telnet/Makefile.in - KRB4 support
telnet/configure.in - cache the info if cc_t is defined
The POSIX_SIGNALS is in aclocal.m4 already - use instead
(CHECK_SIGNALS)
telnetd/Makefile.in - krb4 support
telnetd/configure.in - cc_t info caching
setpgrp argument number caching
The issue with KRB4 support is that libtelnet combines the support
stubs in such a way that you would need both v4 and v5 support at the
same time in the client and server... This is bad because there is no v4
compat_sendaut or mk_req..... This means that the client
would needs v4 credentials to function... Blech...
Anyway, if you leave out the krb4 defines, the other changes to
configure.in are still valid.
Ezra
===================================================================
RCS file: /mit/krb5/.cvsroot/src/appl/telnet/configure.in,v
retrieving revision 1.4
diff -c -r1.4 configure.in
*** 1.4 1994/10/26 05:43:17
--- configure.in 1994/11/11 16:03:35
***************
*** 1,4 ****
--- 1,5 ----
AC_INIT(configure.in)
+ WITH_CCOPTS
AC_SET_BUILDTOP
CONFIG_DIRS(libtelnet telnet telnetd)
MAKE_SUBDIRS("making",all)
===================================================================
RCS file: /mit/krb5/.cvsroot/src/appl/telnet/libtelnet/configure.in,v
retrieving revision 1.5
diff -c -r1.5 configure.in
*** 1.5 1994/10/26 05:43:19
--- configure.in 1994/11/11 16:21:09
***************
*** 12,15 ****
--- 12,18 ----
LIBOBJS="$LIBOBJS getent.o"
KRB_INCLUDE
ISODE_INCLUDE
+ WITH_KRB4
+ AC_ARG_WITH([krb4],,dnl
+ ADD_DEF([-I${KRB4}/include -DKRB4]))
V5_AC_OUTPUT_MAKEFILE
===================================================================
RCS file: /mit/krb5/.cvsroot/src/appl/telnet/telnet/Makefile.in,v
retrieving revision 5.4
diff -c -r5.4 Makefile.in
*** 5.4 1994/09/30 02:56:50
--- Makefile.in 1994/10/01 11:52:59
***************
*** 26,32 ****
CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
ARPA_TELNET= $(srcdir)/../arpa/telnet.h
COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
! K4LIB = $(KRB4)/lib/libkrb.a
KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB)
DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
--- 26,32 ----
CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
ARPA_TELNET= $(srcdir)/../arpa/telnet.h
COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
! K4LIB = @K4LIB@
KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB)
DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
***************
*** 43,49 ****
all:: telnet
telnet: $(OBJS) $(DEPKLIB)
! $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
clean::
$(RM) telnet
--- 43,49 ----
all:: telnet
telnet: $(OBJS) $(DEPKLIB)
! $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(K4LIB) $(LIBS)
clean::
$(RM) telnet
===================================================================
RCS file: /mit/krb5/.cvsroot/src/appl/telnet/telnet/configure.in,v
retrieving revision 5.9
diff -c -r5.9 configure.in
*** 5.9 1994/10/26 05:43:22
--- configure.in 1994/11/11 16:08:56
***************
*** 16,25 ****
if test -z "$ac_termio"; then
AC_HEADER_CHECK(termio.h,AC_DEFINE(SYSV_TERMIO),ac_sysv_termio=1)
if test -z "$ac_sysv_termio"; then
! AC_COMPILE_CHECK([cc_t],[#include <termio.h>],
! [cc_t foo;],,AC_DEFINE(NO_CC_T))
fi
fi
AC_FUNC_CHECK(gettosbyname,AC_DEFINE(HAS_GETTOS))
AC_HEADER_CHECK(sys/filio.h,AC_DEFINE(FILIO_H))
AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS))
--- 16,31 ----
if test -z "$ac_termio"; then
AC_HEADER_CHECK(termio.h,AC_DEFINE(SYSV_TERMIO),ac_sysv_termio=1)
if test -z "$ac_sysv_termio"; then
! AC_MSG_CHECKING([for cc_t in termio.h])
! AC_CACHE_VAL(krb_cv_type_cc_t,
! [AC_TRY_LINK([cc_t],[#include <termio.h>],
! [cc_t foo;],krb_cv_type_cc_t=yes,krb_cv_type_cc_t=no)])
! AC_MSG_RESULT($krb_cv_type_cc_t)
! if test $krb_cv_type_cc_t = no; then
! AC_DEFINE(NO_CC_T)
fi
fi
+ fi
AC_FUNC_CHECK(gettosbyname,AC_DEFINE(HAS_GETTOS))
AC_HEADER_CHECK(sys/filio.h,AC_DEFINE(FILIO_H))
AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS))
***************
*** 27,37 ****
AC_FUNC_CHECK(setupterm,AC_DEFINE(HAS_SETUPTERM))
AC_CHECK_LIB(ndbm,main)
AC_CHECK_LIB(dbm,main)
! AC_FUNC_CHECK(sigprocmask,
! AC_COMPILE_CHECK([sigset_t],
! [#include <signal.h>],
! [sigset_t x],
! AC_DEFINE(POSIX_SIGNALS)))
AC_CHECK_LIB(socket,main)
AC_CHECK_LIB(nsl,main)
V5_AC_OUTPUT_MAKEFILE
--- 33,45 ----
AC_FUNC_CHECK(setupterm,AC_DEFINE(HAS_SETUPTERM))
AC_CHECK_LIB(ndbm,main)
AC_CHECK_LIB(dbm,main)
! CHECK_SIGNALS
! WITH_KRB4
! AC_ARG_WITH([krb4],,dnl
! ADD_DEF(-DKRB4)
! K4LIB="$(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a",
! K4LIB=)
! AC_SUBST(K4LIB)
AC_CHECK_LIB(socket,main)
AC_CHECK_LIB(nsl,main)
V5_AC_OUTPUT_MAKEFILE
===================================================================
RCS file: /mit/krb5/.cvsroot/src/appl/telnet/telnetd/Makefile.in,v
retrieving revision 5.4
diff -c -r5.4 Makefile.in
*** 5.4 1994/09/30 02:56:59
--- Makefile.in 1994/10/01 11:53:09
***************
*** 26,32 ****
CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
ARPA_TELNET= $(srcdir)/../arpa/telnet.h
COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
! K4LIB = $(KRB4)/lib/libkrb.a
KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB)
DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
--- 26,32 ----
CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
ARPA_TELNET= $(srcdir)/../arpa/telnet.h
COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
! K4LIB = @K4LIB@
KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB)
DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
***************
*** 52,58 ****
all:: telnetd
telnetd: $(OBJS) $(DEPKLIB)
! $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
clean::
$(RM) telnetd
--- 52,58 ----
all:: telnetd
telnetd: $(OBJS) $(DEPKLIB)
! $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(K4LIB) $(LIBS)
clean::
$(RM) telnetd
===================================================================
RCS file: /mit/krb5/.cvsroot/src/appl/telnet/telnetd/configure.in,v
retrieving revision 5.12
diff -c -r5.12 configure.in
*** 5.12 1994/11/08 03:52:24
--- configure.in 1994/11/11 16:23:04
***************
*** 7,12 ****
--- 7,17 ----
AC_SET_BUILDTOP
AC_PROG_INSTALL
KRB_INCLUDE
+ WITH_KRB4
+ AC_ARG_WITH([krb4],,
+ K4LIB="$(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a",
+ K4LIB=)
+ AC_SUBST(K4LIB)
ISODE_INCLUDE
AC_CHECK_LIB(ndbm,main)
AC_CHECK_LIB(socket,main)
***************
*** 19,28 ****
if test -z "$ac_termio"; then
AC_HEADER_CHECK(termio.h,AC_DEFINE(SYSV_TERMIO),ac_sysv_termio=1)
if test -z "$ac_sysv_termio"; then
! AC_COMPILE_CHECK([cc_t],[#include <termio.h>],
! [cc_t foo;],,AC_DEFINE(NO_CC_T))
fi
fi
AC_HEADER_TIME
AC_CHECK_HEADERS(sys/time.h sys/tty.h)
AC_HAVE_FUNCS(vhangup)
--- 24,39 ----
if test -z "$ac_termio"; then
AC_HEADER_CHECK(termio.h,AC_DEFINE(SYSV_TERMIO),ac_sysv_termio=1)
if test -z "$ac_sysv_termio"; then
! AC_MSG_CHECKING([for cc_t in termio.h])
! AC_CACHE_VAL(krb_cv_type_cc_t,
! [AC_TRY_LINK([cc_t],[#include <termio.h>],
! [cc_t foo;],krb_cv_type_cc_t=yes,krb_cv_type_cc_t=no)])
! AC_MSG_RESULT($krb_cv_type_cc_t)
! if test $krb_cv_type_cc_t = no; then
! AC_DEFINE(NO_CC_T)
fi
fi
+ fi
AC_HEADER_TIME
AC_CHECK_HEADERS(sys/time.h sys/tty.h)
AC_HAVE_FUNCS(vhangup)
***************
*** 32,38 ****
AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS))
AC_HEADER_CHECK(utmpx.h,AC_DEFINE(UTMPX))
AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT))
! AC_COMPILE_CHECK([number of arguments to setpgrp],
[#include <unistd.h>],[setpgrp(0,0)],
! AC_DEFINE(SETPGRP_TWOARG))
V5_AC_OUTPUT_MAKEFILE
--- 43,56 ----
AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS))
AC_HEADER_CHECK(utmpx.h,AC_DEFINE(UTMPX))
AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT))
! AC_MSG_CHECKING([if setpgrp takes two arguments])
! dnl
! AC_CACHE_VAL(krb5_cv_sys_setpgrp_two,
! [AC_TRY_LINK(
[#include <unistd.h>],[setpgrp(0,0)],
! krb5_cv_sys_setpgrp_two=yes,krb5_cv_sys_setpgrp_two=no)])
! AC_MSG_RESULT($krb5_cv_sys_setpgrp_two)
! if test $krb5_cv_sys_setpgrp_two = yes; then
! AC_DEFINE(SETPGRP_TWOARG)
! fi
V5_AC_OUTPUT_MAKEFILE
