Commit 8d09b941 authored by Niels Möller's avatar Niels Möller
Browse files

minor fixes

Rev: ChangeLog:1.37
Rev: doc/Makefile.am.in:1.6
Rev: doc/PORTS:1.2
Rev: doc/TODO:1.31
Rev: src/Makefile.am.in:1.31
Rev: src/resource.c:1.3
Rev: src/server.c:1.43
Rev: src/ssh1_fallback.c:1.4
Rev: src/symmetric/Makefile.am.in:1.12
Rev: src/symmetric/include/Makefile.am.in:1.6
parent 562cda9a
Tue Feb 16 23:32:51 1999 <nisse@idonex.se>
* src/tty.h, src/tty.c: Fallback macro for the cfmakeraw function.
* src/lsh.c, src/lshd.c: Make it possible to disable pty support a
compile time.
* src/zlib.c: Temporarily disable zlib support, as it is a
dysfunctional state at when I'm building the 1999-02-16 snapshot.
* src/channel.h, optionchannel.c, optionconnection.c,
optionclient.c: Moved the channel table pointer to the connection
object, and general cleanup
(Bazsi).
* configure.in: New option --without-pty to disable pty support.
* make_am, Makefile.am.in: Use BASH variable to start scripts.
* misc/ctags.mk: New file.
Sat Feb 13 17:21:07 1999 <nisse@idonex.se>
* configure.in: Added test for the cfmakeraw function.
* src/client.c (CFMAKERAW): Define this as a macro, if there is no
cfmakeraw function. (Rafal Maszkowski <rzm@icm.edu.pl>)
* configure.in: Check if libutil defines openpty.
* src/server.c (do_spawn_shell): Use STDIN_FILENO when calling
tty_setctty, not pty->slave. The latter fd is already closed.
(Noted by Keresztg).
* configure.in (SHUTDOWN_WORKS_WITH_UNIX_SOCKETS): Use AF_UNIX,
not AF_LOCAL (reported by Heinz Knutzen <heinz.knutzen@landsh.de>)
Thu Feb 11 14:43:51 1999 <nisse@idonex.se>
* src/channel.c (do_channel_request): Delay freeing of packet
(reported by Ray Dassen).
Sun Jan 31 04:25:30 1999 <nisse@puck>
* src/werror.c (werror_vformat): New function, with different
......
......@@ -27,3 +27,5 @@ ps: $(PSS)
$(GROFF) -Tps -mandoc $< > $@
DISTCLEANFILES = $(DVIS) $(PSS)
include $(top_srcdir)/misc/ctags.mk
......@@ -2,10 +2,12 @@ This file lists systems/architectures on which versions of lsh has been
tested.
lsh version: CVS 1998-12-30 with patches
uname -a: Linux penguin.wi.leidenuniv.nl 2.0.36 #2 Mon Nov 16 15:28:56 CET 1998 i586 unknown
libc: libc6 2.0.7v-1
Status: Compiles quite cleanly; both client and server work.
lsh version: 1999-01-28 with patches
uname -a: Linux zensunni 2.0.36 #1 Mon Nov 16 19:50:22 CET 1998 i686 unknown
libc: 2.0.7.19981211
Status: Compiles quite cleanly.
Both client and server work.
SSH1 fallback works.
lsh version: CVS 1998-12-30 with patches
......
......@@ -196,3 +196,9 @@ Include length fields when hashing in
publickey_crypto.c:init_diffie_hellman_instance(). Perhaps some of
this code should be moved to keyexchange.c? Similar considerations
apply also to other hashes.
Fix so that lsh compiles in the absense of zlib.
Fix the cvs_headers not to use the construction "sed -f -", as that
doesn't work with Solaris sed.
......@@ -17,12 +17,13 @@ AUTOMAKE_OPTIONS = foreign
# subdrectries.
# FIXME: Use the BASH variable to execute the script. The problem is
# that the script attempts to start itselt with "$0 args".
# that the script attempts to start itself with "$0 args".
Makefile.am: Makefile.am.in
(cd $(top_srcdir); ./make_am)
bin_PROGRAMS = lsh lshd lsh_keygen lsh_writekey
bin_PROGRAMS = lsh lsh_keygen lsh_writekey
sbin_PROGRAMS = lshd
noinst_PROGRAMS = prime_table digit_table sexp_test
noinst_LIBRARIES = liblsh.a
# noinst_HEADERS = $(dist_x_files) $(cvs_headers)
......@@ -41,7 +42,8 @@ liblsh_a_SOURCES = abstract_io.c abstract_crypto.c abstract_compress.c \
compress.c connection.c crypto.c \
debug.c des.c disconnect.c dsa_keygen.c encrypt.c \
format.c gc.c hmac.c io.c keyexchange.c \
list.c md5.c packet_ignore.c pad.c parse.c password.c publickey_crypto.c \
list.c md5.c \
packet_ignore.c pad.c parse.c password.c publickey_crypto.c \
randomness.c \
read_scan.c read_data.c read_line.c read_packet.c reaper.c resource.c \
server.c server_keyexchange.c server_password.c \
......@@ -53,35 +55,34 @@ liblsh_a_SOURCES = abstract_io.c abstract_crypto.c abstract_compress.c \
atoms_defines.h: atoms.in process_atoms
$(BASH) $(srcdir)/process_atoms header <$(srcdir)/atoms.in >$@T
mv -f $@T $@
test -s $@T && mv -f $@T $@
atoms_gperf.c: atoms.in process_atoms
$(BASH) $(srcdir)/process_atoms gperf <$(srcdir)/atoms.in \
| gperf >$@T -LANSI-C -t -c -l -k1,7,$$ -N gperf_atom
mv -f $@T $@
test -s $@T && mv -f $@T $@
atoms_table.c: atoms.in process_atoms
$(BASH) $(srcdir)/process_atoms table <$(srcdir)/atoms.in >$@T
mv -f $@T $@
test -s $@T && mv -f $@T $@
PRIME_LIMIT = 1024
prime_table.h: prime_table
./prime_table $(PRIME_LIMIT) >$@T
mv -f $@T $@
test -s $@T && mv -f $@T $@
prime_table_LDADD =
# FIXME: Use the SCHEME-variable
sexp_table.h: sexp_chars.in $(srcdir)/make_char_classes
$(srcdir)/make_char_classes <$< >$@T
mv -f $@T $@
$(SCHEME) -e main -s $(srcdir)/make_char_classes <$< >$@T
test -s $@T && mv -f $@T $@
digit_table_LDADD =
digit_table.h: digit_table
./digit_table >$@T
mv -f $@T $@
test -s $@T && mv -f $@T $@
LDADD = @LIBOBJS@ liblsh.a symmetric/libsymmetric.a
......@@ -121,7 +122,7 @@ depend:
# There are three problems with this rule:
# 1. It causes the dependency files to be created twice. It would be
# better to add .deps/%.P as an extra target to compileation rule.
# better to add .deps/%.P as an extra target to compilation rule.
# I.e, %.o .deps/%.P : %.c
# 2. It should not depend on the .c.x file.
......@@ -134,36 +135,10 @@ depend:
MAINTAINERCLEANFILES += $(DEP_FILES)
.PHONY: ctags-recursive ctags
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
(cd $$subdir && $(MAKE) ctags); \
done
ctags: ctags-recursive $(HEADERS) $(SOURCES) $(CONFIG_HEADER) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
test -f $$subdir/tags && tags="$$tags $$here/$$subdir/tags"; \
done; \
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$(CONFIG_HEADER)$$unique$(LISP)$$tags" \
|| (cd $(srcdir) && ctags --langmap=c:.c.x -o $$here/tags $(CTAGS_ARGS) $$tags $(CONFIG_HEADER) $$unique $(LISP))
# This treats .h.x files as C files rather than headers, but we can't
# distinguish them from .c.x files with ctags.
# Override the standard distclean-tags target, as this doesn't support `tags'
distclean-tags:
-rm -f TAGS ID tags
# This is GNU make specific
# FIXME: Use the SCHEME-variable
%.x: % $(srcdir)/make_class
$(srcdir)/make_class <$< >$@T
mv -f $@T $@
$(SCHEME) -e main -s $(srcdir)/make_class <$< >$@T
test -s $@T && mv -f $@T $@
include $(top_srcdir)/misc/ctags.mk
......@@ -41,8 +41,6 @@ void dont_free_live_resource(int alive);
#include "resource.h.x"
#undef CLASS_DEFINE
#include "resource.c.x"
void do_mark_resources(struct resource_node *n,
void (*mark)(struct lsh_object *o))
{
......
......@@ -803,6 +803,7 @@ static int make_pipes(int *in, int *out, int *err)
return 0;
}
#if WITH_PTY_SUPPORT
static int make_pty(struct pty_info *pty, int *in, int *out, int *err)
{
int saved_errno = 0;
......@@ -854,6 +855,11 @@ static int make_pty(struct pty_info *pty, int *in, int *out, int *err)
errno = saved_errno;
return 0;
}
#else /* !WITH_PTY_SUPPORT */
static int make_pty(struct pty_info *pty UNUSED,
int *in UNUSED, int *out UNUSED, int *err UNUSED)
{ return 0; }
#endif /* !WITH_PTY_SUPPORT */
#define USE_LOGIN_DASH_CONNVENTION 1
......@@ -990,9 +996,12 @@ static int do_spawn_shell(struct channel_request *c,
}
close(err[0]);
close(err[1]);
#if WITH_PTY_SUPPORT
if (using_pty)
tty_setctty(session->pty->slave);
tty_setctty(STDIN_FILENO);
#endif /* WITH_PTY_SUPPORT */
#if 1
#if USE_LOGIN_DASH_CONNVENTION
{
......@@ -1125,6 +1134,7 @@ struct channel_request *make_shell_handler(struct io_backend *backend,
return &closure->super;
}
#if WITH_PTY_SUPPORT
/* pty_handler */
static int do_alloc_pty(struct channel_request *c UNUSED,
struct ssh_channel *channel,
......@@ -1208,3 +1218,4 @@ struct channel_request *make_pty_handler(void)
return self;
}
#endif /* WITH_PTY_SUPPORT */
......@@ -96,6 +96,8 @@ static int fall_back_to_ssh1(struct ssh1_fallback *c,
werror("lshd: fall_back_to_ssh1: execl failed (errno = %i): %z\n",
errno, strerror(errno));
_exit(EXIT_FAILURE);
/* To make gcc happy, if _exit is not declared as NORETURN */
return 0;
}
else
{ /* pid > 0 */
......
......@@ -72,28 +72,4 @@ depend:
MAINTAINERCLEANFILES += $(DEP_FILES)
.PHONY: ctags-recursive ctags
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
(cd $$subdir && $(MAKE) ctags); \
done
ctags: ctags-recursive $(HEADERS) $(SOURCES) $(CONFIG_HEADER) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
test -f $$subdir/tags && tags="$$tags $$here/$$subdir/tags"; \
done; \
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$(CONFIG_HEADER)$$unique$(LISP)$$tags" \
|| (cd $(srcdir) && ctags --langmap=c:.c.x -o $$here/tags $(CTAGS_ARGS) $$tags $(CONFIG_HEADER) $$unique $(LISP))
# This treats .h.x files as C files rather than headers, but we can't
# distinguish them from .c.x files with ctags.
# Override the standard distclean-tags target, as this doesn't support `tags'
distclean-tags:
-rm -f TAGS ID tags
include $(top_srcdir)/misc/ctags.mk
......@@ -7,28 +7,4 @@ EXTRA_DIST = $(cvs_headers) Makefile.am.in
Makefile.am: Makefile.am.in
(cd $(top_srcdir); ./make_am)
.PHONY: ctags-recursive ctags
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
(cd $$subdir && $(MAKE) ctags); \
done
ctags: ctags-recursive $(HEADERS) $(SOURCES) $(CONFIG_HEADER) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
test -f $$subdir/tags && tags="$$tags $$here/$$subdir/tags"; \
done; \
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$(CONFIG_HEADER)$$unique$(LISP)$$tags" \
|| (cd $(srcdir) && ctags --langmap=c:.c.x -o $$here/tags $(CTAGS_ARGS) $$tags $(CONFIG_HEADER) $$unique $(LISP))
# This treats .h.x files as C files rather than headers, but we can't
# distinguish them from .c.x files with ctags.
# Override the standard distclean-tags target, as this doesn't support `tags'
distclean-tags:
-rm -f TAGS ID tags
include $(top_srcdir)/misc/ctags.mk
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment