Makefile.am and quick hacks

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2140 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-10 12:54:14 +00:00
parent 89192d7edc
commit 7841b971fb
9 changed files with 53 additions and 7 deletions

5
appl/telnet/Makefile.am Normal file
View File

@@ -0,0 +1,5 @@
# $Id$
AUTOHEADER_FLAGS = no-dependencies foreign
SUBDIRS = libtelnet telnet telnetd

View File

@@ -0,0 +1,10 @@
# $Id$
AUTOHEADER_FLAGS = no-dependencies foreign
INCLUDES = -I$(top_builddir)/include -I$(srcdir)/..
noinst_LIBRARIES = libtelnet.a
libtelnet_a_SOURCES = auth.c encrypt.c genget.c enc_des.c misc.c kerberos.c \
kerberos5.c read_password.c

View File

@@ -0,0 +1,13 @@
# $Id$
AUTOHEADER_FLAGS = no-dependencies foreign
INCLUDES = -I$(top_builddir)/include -I$(srcdir)/..
bin_PROGRAMS = telnet
telnet_SOURCES = authenc.c commands.c main.c network.c ring.c \
sys_bsd.c telnet.c terminal.c \
utilities.c
LDADD = -L../libtelnet -ltelnet -L$(top_builddir)/lib/krb5 -lkrb5 -L$(top_builddir)/lib/des -ldes -L$(top_builddir)/lib/asn1 -lasn1 @LIB_tgetent@ -L$(top_builddir)/lib/roken -lroken

View File

@@ -1554,7 +1554,8 @@ env_init(void)
char hbuf[256+1];
char *cp2 = strchr((char *)ep->value, ':');
k_gethostname(hbuf, 256);
/* XXX - should be k_gethostname? */
gethostname(hbuf, 256);
hbuf[256] = '\0';
/* If this is not the full name, try to get it via DNS */

View File

@@ -1999,7 +1999,8 @@ telnet(char *user)
static char local_host[256] = { 0 };
if (!local_host[0]) {
k_gethostname(local_host, sizeof(local_host));
/* XXX - should be k_gethostname? */
gethostname(local_host, sizeof(local_host));
local_host[sizeof(local_host)-1] = 0;
}
auth_encrypt_init(local_host, hostname, "TELNET", 0);

View File

@@ -136,7 +136,6 @@
#endif
#include <roken.h>
#include <krb.h>
#if defined(AUTHENTICATION) || defined(ENCRYPTION)
#include <libtelnet/auth.h>

View File

@@ -0,0 +1,12 @@
# $Id$
AUTOHEADER_FLAGS = no-dependencies foreign
INCLUDES = -I$(top_builddir)/include -I$(srcdir)/..
libexec_PROGRAMS = telnetd
telnetd_SOURCES = telnetd.c state.c termstat.c slc.c sys_term.c \
utility.c global.c authenc.c
LDADD = -L../libtelnet -ltelnet -L$(top_builddir)/lib/krb5 -lkrb5 -L$(top_builddir)/lib/des -ldes -L$(top_builddir)/lib/asn1 -lasn1 @LIB_tgetent@ -L$(top_builddir)/lib/roken -lroken

View File

@@ -346,7 +346,7 @@ int main(int argc, char **argv)
else
port = htons(atoi(*argv));
} else {
port = k_getportbyname ("telnet", "tcp", htons(23));
port = krb5_getportbyname ("telnet", "tcp", htons(23));
}
mini_inetd (port);
} else if (argc > 0) {
@@ -727,7 +727,8 @@ Please contact your net administrator");
remote_host_name[sizeof(remote_host_name)-1] = 0;
host = remote_host_name;
k_gethostname(host_name, sizeof (host_name));
/* XXX - should be k_gethostname? */
gethostname(host_name, sizeof (host_name));
hostname = host_name;
#ifndef abs

View File

@@ -151,8 +151,6 @@
#include <paths.h>
#endif
#include <protos.h>
#ifdef SOCKS
#include <socks.h>
#endif
@@ -174,6 +172,12 @@
/* Don't use the system login, use our version instead */
/* BINDIR should be defined somewhere else... */
#ifndef BINDIR
#define BINDIR "/usr/athena"
#endif
#undef _PATH_LOGIN
#define _PATH_LOGIN BINDIR "/login"