[1302] in Kerberos-V5-bugs

home	help	back	first	fref	pref	prev	next	nref	lref	last	post

krb5b4pl3: appl/telnet: should check for -with-krb4

daemon@ATHENA.MIT.EDU (Jonathan I. Kamens)
Sun Mar 26 22:52:28 1995

From: "Jonathan I. Kamens" <jik@cam.ov.com>
Date: Sun, 26 Mar 1995 22:55:40 -0500
To: krb5-bugs@MIT.EDU

See Subject.

Patch:

--- appl/telnet/libtelnet/Makefile.in	1995/03/24 23:00:04	1.2
+++ appl/telnet/libtelnet/Makefile.in	1995/03/27 03:21:09
@@ -19,8 +19,8 @@
 #
 #	@(#)Makefile.generic	5.5 (Berkeley) 3/1/91
 #
 AUTH_DEF=-DAUTHENTICATION -DKRB5 -DFORWARD -UNO_LOGIN_F -DLOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
-LOCALINCLUDES=-I.. -I$(srcdir)/..
+LOCALINCLUDES=-I.. -I$(srcdir)/.. -I$(SRCTOP)/include/kerberosIV
 CFLAGS = $(CCOPTS) $(AUTH_DEF) $(DEFS) $(LOCALINCLUDES)
 LIBOBJS=@LIBOBJS@
 
--- appl/telnet/libtelnet/configure.in	1995/03/27 03:14:14	1.1
+++ appl/telnet/libtelnet/configure.in	1995/03/27 03:14:48
@@ -11,5 +11,7 @@
 AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT))
 LIBOBJS="$LIBOBJS getent.o"
 KRB_INCLUDE
+WITH_KRB4
 ISODE_INCLUDE
+AC_WITH([krb4],ADD_DEF(-DKRB4),)
 AC_OUTPUT(Makefile,[EXTRA_RULES])
--- appl/telnet/telnet/Makefile.in	1995/03/24 22:58:14	1.2
+++ appl/telnet/telnet/Makefile.in	1995/03/27 03:31:51
@@ -20,13 +20,13 @@
 #	@(#)Makefile.generic	5.5 (Berkeley) 3/1/91
 #
 
 AUTH_DEF=-DAUTHENTICATION -DKRB5 -DFORWARD -UNO_LOGIN_F -DLOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
 OTHERDEFS=-DLINEMODE -DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
 LOCALINCLUDES=-I.. -I$(srcdir)/..
 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
+K4LIB = @K4LIB@
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
@@ -43,7 +43,7 @@
 all:: telnet
 
 telnet:	$(OBJS) $(DEPKLIB)
-	$(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
+	$(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(K4LIB) $(LIBS)
 
 clean::
 	$(RM) telnet
--- appl/telnet/telnet/configure.in	1995/03/27 03:25:15	1.1
+++ appl/telnet/telnet/configure.in	1995/03/27 03:41:10
@@ -1,6 +1,7 @@
 AC_INIT(telnet.c)
 WITH_CCOPTS
 WITH_KRB5ROOT
+WITH_KRB4
 ISODE_DEFS
 ISODE_INCLUDE
 CONFIG_RULES
@@ -34,4 +35,9 @@
 AC_DEFINE(POSIX_SIGNALS)))
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
+AC_WITH([krb4],
+ADD_DEF(-DKRB4)
+K4LIB='$(KRB4)/lib/libkrb.a $(TOPLIBD)/libdes425.a $(TOPLIBD)/libcrypto.a',
+K4LIB=)
+AC_SUBST(K4LIB)
 AC_OUTPUT(Makefile,[EXTRA_RULES])
--- appl/telnet/telnetd/Makefile.in	1995/03/24 22:59:23	1.2
+++ appl/telnet/telnetd/Makefile.in	1995/03/27 03:45:54
@@ -20,13 +20,13 @@
 #	@(#)Makefile.generic	5.5 (Berkeley) 3/1/91
 #
 
 AUTH_DEF=-DAUTHENTICATION -DKRB5 -DFORWARD -UNO_LOGIN_F -DLOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
 OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
 LOCALINCLUDES=-I.. -I$(srcdir)/..
 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
+K4LIB = @K4LIB@
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
@@ -52,7 +52,7 @@
 all:: telnetd
 
 telnetd: $(OBJS) $(DEPKLIB)
-	$(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
+	$(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(K4LIB) $(LIBS)
 
 clean::
 	$(RM) telnetd
--- appl/telnet/telnetd/configure.in	1995/03/27 03:40:46	1.1
+++ appl/telnet/telnetd/configure.in	1995/03/27 03:41:12
@@ -1,6 +1,7 @@
 AC_INIT(telnetd.c)
 WITH_CCOPTS
 WITH_KRB5ROOT
+WITH_KRB4
 ISODE_DEFS
 ISODE_INCLUDE
 CONFIG_RULES
@@ -32,4 +33,9 @@
 AC_COMPILE_CHECK([number of arguments to setpgrp],
 [#include <unistd.h>],[setpgrp(0,0)],
 AC_DEFINE(SETPGRP_TWOARG))
+AC_WITH([krb4],
+ADD_DEF(-DKRB4)
+K4LIB='$(KRB4)/lib/libkrb.a $(TOPLIBD)/libdes425.a $(TOPLIBD)/libcrypto.a',
+K4LIB=)
+AC_SUBST(K4LIB)
 AC_OUTPUT(Makefile,[EXTRA_RULES])

home	help	back	first	fref	pref	prev	next	nref	lref	last	post