build ssh components using our build model

21 files changed, 234 insertions, 13031 deletions

diff --git a/usr.bin/ssh/Makefile b/usr.bin/ssh/Makefile
index 15edbc03b8f..291be696b9f 100644
--- a/usr.bin/ssh/Makefile
+++ b/usr.bin/ssh/Makefile
@@ -1,344 +1,7 @@
-# Generated automatically from Makefile.in by configure.
-#
-# Makefile.in
-#
-# Author: Tatu Ylonen <ylo@cs.hut.fi>
-#
-# Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-#                    All rights reserved
-#
-# Created: Wed Mar 22 17:37:49 1995 ylo
-#
-# $Id: Makefile,v 1.1 1999/09/26 20:53:32 deraadt Exp $
-#
+#	$OpenBSD: Makefile,v 1.2 1999/09/26 21:47:52 deraadt Exp $
 
-srcdir 		= .
+.include <bsd.own.mk>
 
+SUBDIR= ssh sshd ssh-add ssh-keygen ssh-agent scp
 
-install_prefix	=
-prefix		= /usr/local
-exec_prefix	= ${prefix}
-bindir		= $(exec_prefix)/bin
-sbindir		= $(exec_prefix)/sbin
-mandir		= $(prefix)/man
-man1dir		= $(mandir)/man1
-man8dir		= $(mandir)/man8
-etcdir		= /etc
-piddir		= /var/run
-
-CC 		= gcc -pipe
-CFLAGS 		= -g -O2
-LDFLAGS		= 
-DEFS 		= -DHAVE_CONFIG_H
-LIBS		= -lkrb -lz -lcrypto -ldes -lgmp  -lutil
-LIBOBJS		= 
-CONFOBJS	=  bf_skey.o bf_enc.o compress.o
-
-MAKEDEP		= makedepend
-LN_S		= ln -s
-RANLIB		= ranlib
-INSTALL		= /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA	= ${INSTALL} -m 644
-WISH		= /usr/local/bin/wish
-
-GMPLIBS	= -lgmp
-GMPINCS	= 
-
-KRB4_AUTH   = 
-KRB4_ROOT   = 
-KRB4_INCS   = 
-KRB4_LIBS   = 
-RADIX       = 
-
-RSAREFDEP	= 
-
-transform	= s,x,x,
-
-HOST_KEY_FILE 	= $(etcdir)/ssh_host_key
-HOST_CONFIG_FILE = $(etcdir)/ssh_config
-SERVER_CONFIG_FILE = $(etcdir)/sshd_config
-
-SHELL = /bin/sh
-
-#ZLIBLIBS	= -L$(ZLIBDIR) -lz
-#ZINCS = 
-
-RSAREFDIR	= rsaref2
-RSAREFSRCDIR 	= $(RSAREFDIR)/source
-
-CIPHER_OBJS = cipher.o $(CONFOBJS)
-COMMON_OBJS = $(LIBOBJS) \
-	rsa.o randoms.o ssh_md5.o buffer.o packet.o \
-	xmalloc.o ttymodes.o channels.o bufaux.o authfd.o authfile.o crc32.o \
-	rsaglue.o match.o mpaux.o minfd.o $(CIPHER_OBJS)
-SSHD_OBJS = sshd.o $(KRB4_AUTH) auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o pty.o \
-	log-server.o login.o hostfile.o canohost.o servconf.o tildexpand.o \
-	uidswap.o serverloop.o $(RADIX) $(COMMON_OBJS)
-SSH_OBJS = ssh.o sshconnect.o log-client.o readconf.o hostfile.o readpass.o \
-	tildexpand.o uidswap.o clientloop.o canohost.o $(RADIX) $(COMMON_OBJS)
-KEYGEN_OBJS = ssh-keygen.o log-client.o readpass.o rsa.o randoms.o ssh_md5.o \
-	buffer.o xmalloc.o authfile.o $(CIPHER_OBJS) mpaux.o \
-	bufaux.o $(LIBOBJS)
-AGENT_OBJS = ssh-agent.o log-client.o rsa.o randoms.o ssh_md5.o buffer.o \
-	xmalloc.o bufaux.o authfd.o authfile.o rsaglue.o $(CIPHER_OBJS) \
-	mpaux.o minfd.o $(LIBOBJS)
-ADD_OBJS = ssh-add.o log-client.o readpass.o rsa.o randoms.o ssh_md5.o buffer.o \
-	xmalloc.o bufaux.o authfd.o authfile.o $(CIPHER_OBJS) \
-	mpaux.o minfd.o $(LIBOBJS)
-SCP_OBJS = scp.o xmalloc.o
-GEN_MINFD_OBJS = gen_minfd.o $(LIBOBJS)
-
-USER_SHELLS = sh jsh ksh csh tcsh bash zsh ash
-
-SRCS = $(SSHD_OBJS:.o=.c) $(SSH_OBJS:.o=.c) $(KEYGEN_OBJS:.o=.c) \
-	$(AGENT_OBJS:.o=.c) $(ADD_OBJS:.o=.c) \
-	$(SCP_OBJS:.o=.c) \
-	$(GEN_MINFD_OBJS:.o=.c)
-EXTRA_SRCS = memmove.c strerror.c remove.c random.c putenv.c osfc2.c \
-	socketpair.c
-MAN1PAGES = ssh-keygen.1 ssh-agent.1 ssh-add.1 scp.1
-MAN1GENERATED = ssh.1
-MAN1SOURCES = ssh.1.in ssh-keygen.1 ssh-agent.1 ssh-add.1 scp.1
-MAN8GENERATED = sshd.8
-MAN8SOURCES = sshd.8.in
-
-DISTFILES = COPYING.Ylonen README.AFS-KERBEROS README README.SECURID \
-	INSTALL TODO OVERVIEW \
-	configure configure.in config.guess config.sub Makefile.in \
-	ssh-askpass.wish host_config.sample config.sample \
-	acconfig.h config.h.in server_config.sample \
-	$(MAN1SOURCES) $(MAN8SOURCES) *.c *.h install-sh \
-	RFC.nroff RFC \
-	ChangeLog
-
-DISTNAME = `sed 's/.*"\(.*\)".*/\1/' version.h`
-
-NORMAL_PROGRAMS = ssh-keygen ssh-askpass ssh-agent ssh-add scp
-
-SBIN_PROGRAMS = sshd
-PROGRAMS = ssh $(SBIN_PROGRAMS) $(NORMAL_PROGRAMS)
-SSH_PROGRAM = $(bindir)/ssh
-
-all: $(PROGRAMS)
-
-RFC: RFC.nroff rfc-pg
-	tbl RFC.nroff | nroff -ms | sed 's/FORMFEED\[Page/        [Page/' | ./rfc-pg -n5 >RFC
-
-rfc-pg: rfc-pg.c
-	$(CC) -o rfc-pg rfc-pg.c
-
-.c.o:
-	$(CC) -c -I. $(KRB4_INCS) $(GMPINCS) $(ZINCS) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" $(CFLAGS) $<
-
-sshd: $(SSHD_OBJS)  $(RSAREFDEP)
-	-rm -f sshd
-	$(CC) $(LDFLAGS) -o sshd $(SSHD_OBJS) $(GMPLIBS) $(ZLIBLIBS) $(KRB4_LIBS) $(LIBS)
-
-ssh: $(SSH_OBJS)  $(RSAREFDEP)
-	-rm -f ssh
-	$(CC) $(LDFLAGS) -o ssh $(SSH_OBJS) $(GMPLIBS) $(ZLIBLIBS) $(KRB4_LIBS) $(LIBS)
-
-ssh-keygen: $(KEYGEN_OBJS)  $(RSAREFDEP)
-	-rm -f ssh-keygen
-	$(CC) $(LDFLAGS) -o ssh-keygen $(KEYGEN_OBJS) $(GMPLIBS) $(KRB4_LIBS) $(LIBS)
-
-ssh-agent: $(AGENT_OBJS)  $(RSAREFDEP)
-	-rm -f ssh-agent
-	$(CC) $(LDFLAGS) -o ssh-agent $(AGENT_OBJS) $(GMPLIBS) $(KRB4_LIBS) $(LIBS)
-
-ssh-add: $(ADD_OBJS)  $(RSAREFDEP)
-	-rm -f ssh-add
-	$(CC) $(LDFLAGS) -o ssh-add $(ADD_OBJS) $(GMPLIBS) $(KRB4_LIBS) $(LIBS)
-
-scp: $(SCP_OBJS) $(LIBOBJS)
-	-rm -f scp
-	$(CC) $(LDFLAGS) -o scp $(SCP_OBJS) $(LIBOBJS) $(KRB4_LIBS) $(LIBS)
-
-ssh-askpass: ssh-askpass.wish
-	-rm -f ssh-askpass
-	echo "#! $(WISH) -f" >ssh-askpass
-	cat $(srcdir)/ssh-askpass.wish >>ssh-askpass
-	chmod +x ssh-askpass
-
-gen_minfd: $(GEN_MINFD_OBJS)
-	$(CC) $(LDFLAGS) -o gen_minfd $(GEN_MINFD_OBJS) $(LIBS)
-
-minfd.o: minfd.h
-minfd.h: gen_minfd
-	rm -f minfd.h minfd.h~
-	./gen_minfd $(USER_SHELLS) > minfd.h~
-	mv -f minfd.h~ minfd.h
-
-$(RSAREFSRCDIR)/librsaref.a:
-	-if test '!' -d $(RSAREFDIR); then \
-	  (cd $(srcdir); tar cf - $(RSAREFSRCDIR)) | tar xf -; fi
-	cd $(RSAREFSRCDIR); $(MAKE) -f ../../Makefile librsaref.a
-
-RSAREFSRCS = desc.c digit.c md2c.c md5c.c nn.c prime.c r_dh.c r_encode.c \
-	r_enhanc.c r_keygen.c r_random.c r_stdlib.c rsa.c
-
-# Note: this target is used in a recursive make, with VPATH pointing to source
-librsaref.a:
-	for i in $(RSAREFSRCS); do $(CC) $(CFLAGS) -c $$i; done
-	$(AR) rc librsaref.a $(RSAREFSRCS:.c=.o)
-	$(RANLIB) librsaref.a
-
-# Creates /etc/ssh_host_key
-generate-host-key:
-	-@if test -f $(install_prefix)$(HOST_KEY_FILE); \
-          then echo "You already have a host key in $(install_prefix)$(HOST_KEY_FILE)."; \
-	  else \
-	    umask 022; echo "Generating 1024 bit host key."; \
-	    ./ssh-keygen -b 1024 -f $(install_prefix)$(HOST_KEY_FILE) -N ''; \
-	  fi
-
-# Creates install directories
-make-dirs:
-	-umask 022; if test '!' -d $(install_prefix)$(prefix); then \
-	  mkdir $(install_prefix)$(prefix); fi; \
-	if test '!' -d $(install_prefix)$(exec_prefix); then \
-	  mkdir $(install_prefix)$(exec_prefix); fi; \
-	if test '!' -d $(install_prefix)$(etcdir); then \
-	  mkdir $(install_prefix)$(etcdir); fi; \
-	if test '!' -d $(install_prefix)$(bindir); then \
-	  mkdir $(install_prefix)$(bindir); fi; \
-	if test '!' -d $(install_prefix)$(sbindir); then \
-	  mkdir $(install_prefix)$(sbindir); fi; \
-	if test '!' -d $(install_prefix)$(mandir); then \
-	  mkdir $(install_prefix)$(mandir); fi; \
-	if test '!' -d $(install_prefix)$(man1dir); then \
-	  mkdir $(install_prefix)$(man1dir); fi; \
-	if test '!' -d $(install_prefix)$(man8dir); then \
-	  mkdir $(install_prefix)$(man8dir); fi
-
-# Ssh is much to large and hairy to be installed suid root by
-# default. Disabled for now/bg. If you really need rhosts
-# authentication do a manual chmod u+s $(install_prefix)$(bindir)/ssh.
-#
-# Ssh is preferably installed suid root.  It can also be used non-root,
-# but then it cannot connect from a privileged socket, and rhosts
-# authentication will be disabled.
-#
-# Sshd is not suid root, but should preferably be run as root
-# (otherwise it can only log in as the user it runs as, and must be
-# bound to a non-privileged port).  Also, password authentication may
-# not be available if non-root and using shadow passwords.
-install: $(PROGRAMS) make-dirs generate-host-key
-	$(INSTALL_PROGRAM) -o root -m 0755 ssh $(install_prefix)$(bindir)/ssh
-	-if test "`echo ssh | sed '$(transform)'`" '!=' ssh; then \
-	  rm -f $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; \
-	  $(LN_S) ssh \
-	    $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; fi
-	rm -f $(install_prefix)$(bindir)/slogin
-	$(LN_S) ssh $(install_prefix)$(bindir)/slogin
-	-if test "`echo slogin | sed '$(transform)'`" '!=' slogin; then \
-	  rm -f $(install_prefix)$(bindir)/`echo slogin | sed '$(transform)'`;\
-	  $(LN_S) ssh \
-	    $(install_prefix)$(bindir)/`echo slogin | sed '$(transform)'`; fi
-	-for p in $(NORMAL_PROGRAMS); do \
-	  $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(bindir)/$$p; \
-	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-	    rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \
-	    $(LN_S) $$p \
-	      $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; fi; \
-	done
-# Remove $(etcdir)/sshd_pid as it is now $(bindir)/sshd.pid
-	-rm -f $(install_prefix)$(etcdir)/sshd_pid
-# Remove $(bindir)/sshd to avoid confusion since it is now in $(sbindir)
-	-rm -f $(install_prefix)$(bindir)/sshd
-	-rm -f $(install_prefix)$(bindir)/`echo sshd | sed '$(transform)'`
-	-for p in $(SBIN_PROGRAMS); do \
-	  $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(sbindir)/$$p; \
-	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-	    rm -f $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`;\
-	    $(LN_S) $$p \
-	      $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; fi;\
-	done
-	-for p in $(MAN1PAGES); do \
-	  $(INSTALL_DATA) -m 0644 $(srcdir)/$$p $(install_prefix)$(man1dir)/$$p ; \
-	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-	    rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\
-	    $(LN_S) $$p \
-	      $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`; \
-	  fi; \
-	done
-	rm -f $(install_prefix)$(man1dir)/slogin.1
-	$(LN_S) ssh.1 $(install_prefix)$(man1dir)/slogin.1
-	if test "`echo slogin.1 | sed '$(transform)'`" '!=' slogin.1; then \
-	  rm -f $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`;\
-	  $(LN_S) ssh.1 \
-	    $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`; \
-	fi
-	-for p in $(MAN1GENERATED); do \
-	  $(INSTALL_DATA) -m 0644 $$p $(install_prefix)$(man1dir)/$$p ; \
-	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-	    rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\
-	    $(LN_S) $$p \
-	      $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`; \
-	  fi; \
-	done
-	-for p in $(MAN8GENERATED); do \
-	  $(INSTALL_DATA) -m 0644 $$p $(install_prefix)$(man8dir)/$$p; \
-	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-	    rm -f $(install_prefix)$(man8dir)/`echo $$p | sed '$(transform)'`;\
-	    $(LN_S) $$p \
-	      $(install_prefix)$(man8dir)/`echo $$p | sed '$(transform)'`; fi;\
-	done
-	-if test '!' -f $(install_prefix)$(HOST_CONFIG_FILE); then \
-	  $(INSTALL_DATA) -m 0644 $(srcdir)/host_config.sample \
-	    $(install_prefix)$(HOST_CONFIG_FILE); fi
-	-if test '!' -f $(install_prefix)$(SERVER_CONFIG_FILE); then \
-	  cat $(srcdir)/server_config.sample | \
-	  sed "s#_ETCDIR_#$(etcdir)#g" >/tmp/ssh_inst.$$; \
-	  $(INSTALL_DATA) -m 0644 /tmp/ssh_inst.$$ \
-	    $(install_prefix)$(SERVER_CONFIG_FILE); \
-	  rm -f /tmp/ssh_inst.$$; fi
-
-uninstall:
-	for p in ssh $(NORMAL_PROGRAMS); do \
-	  rm -f $(install_prefix)$(bindir)/$$p; \
-	  rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \
-	done
-	for p in $(SBIN_PROGRAMS); do \
-	  rm -f $(install_prefix)$(sbindir)/$$p; \
-	  rm -f $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; \
-	done
-	rm -f $(install_prefix)$(bindir)/slogin
-	rm -f $(install_prefix)$(bindir)/`echo slogin | sed '$(transform)'`
-	for p in $(MAN1PAGES) $(MAN1GENERATED); do \
-	  rm -f $(install_prefix)$(man1dir)/$$p; \
-	  rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`; \
-	done
-	for p in $(MAN8GENERATED); do \
-	  rm -f $(install_prefix)$(man8dir)/$$p; \
-	  rm -f $(install_prefix)$(man8dir)/`echo $$p | sed '$(transform)'`; \
-	done
-
-clean:
-	-rm -f *.o minfd.h gmon.out core $(PROGRAMS) gen_minfd rfc-pg
-#	cd $(RSAREFSRCDIR); rm -f *.o *.a
-
-distclean: clean
-	-rm -f Makefile config.status config.cache config.log config.h
-	-rm -f ssh.1 sshd.8
-
-dist:
-	-rm -rf $(DISTNAME)
-	-mkdir $(DISTNAME)
-	cp $(DISTFILES) $(DISTNAME)
-	-rm -f $(DISTNAME)/config.h
-#	tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
-#	cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
-	tar cf $(DISTNAME).tar $(DISTNAME)
-	-rm -f $(DISTNAME).tar.gz
-	gzip $(DISTNAME).tar
-	rm -rf $(DISTNAME)
-	@echo Distribution left in $(DISTNAME).tar.gz
-#	@echo Incrementing version number...
-#	@old_version=`sed 's/.*\.\([0-9][0-9]*\)"$$/\1/' version.h`; \
-#	 new_version=`expr $$old_version + 1`; \
-#	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed version.h >/dev/null
-
-depend:
-	$(MAKEDEP) -I$(srcdir) -I. $(GMPINCS) $(ZINCS) $(DEFS) $(SRCS)
+.include <bsd.subdir.mk>
diff --git a/usr.bin/ssh/Makefile.in b/usr.bin/ssh/Makefile.in
deleted file mode 100644
index 2f22ce010a3..00000000000
--- a/usr.bin/ssh/Makefile.in
+++ /dev/null
@@ -1,344 +0,0 @@
-#
-# Makefile.in
-#
-# Author: Tatu Ylonen <ylo@cs.hut.fi>
-#
-# Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-#                    All rights reserved
-#
-# Created: Wed Mar 22 17:37:49 1995 ylo
-#
-# $Id: Makefile.in,v 1.1 1999/09/26 20:53:32 deraadt Exp $
-#
-
-srcdir 		= @srcdir@
-
-VPATH 		= $(srcdir)
-
-install_prefix	=
-prefix		= @prefix@
-exec_prefix	= @exec_prefix@
-bindir		= $(exec_prefix)/bin
-sbindir		= $(exec_prefix)/sbin
-mandir		= $(prefix)/man
-man1dir		= $(mandir)/man1
-man8dir		= $(mandir)/man8
-etcdir		= @ETCDIR@
-piddir		= @PIDDIR@
-
-CC 		= @CC@
-CFLAGS 		= @CFLAGS@
-LDFLAGS		= @LDFLAGS@
-DEFS 		= @DEFS@
-LIBS		= @LIBS@
-LIBOBJS		= @LIBOBJS@
-CONFOBJS	= @CONFOBJS@
-
-MAKEDEP		= @MAKEDEP@
-LN_S		= @LN_S@
-RANLIB		= @RANLIB@
-INSTALL		= @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA	= @INSTALL_DATA@
-WISH		= @WISH@
-
-GMPLIBS	= @GMPLIBS@
-GMPINCS	= @GMPINCS@
-
-KRB4_AUTH   = @KRB4_AUTH@
-KRB4_ROOT   = @KRB4_ROOT@
-KRB4_INCS   = @KRB4_INCS@
-KRB4_LIBS   = @KRB4_LIBS@
-RADIX       = @RADIX@
-
-RSAREFDEP	= @RSAREFDEP@
-
-transform	= @program_transform_name@
-
-HOST_KEY_FILE 	= $(etcdir)/ssh_host_key
-HOST_CONFIG_FILE = $(etcdir)/ssh_config
-SERVER_CONFIG_FILE = $(etcdir)/sshd_config
-
-SHELL = /bin/sh
-
-#ZLIBLIBS	= -L$(ZLIBDIR) -lz
-#ZINCS = 
-
-RSAREFDIR	= rsaref2
-RSAREFSRCDIR 	= $(RSAREFDIR)/source
-
-CIPHER_OBJS = cipher.o $(CONFOBJS)
-COMMON_OBJS = $(LIBOBJS) \
-	rsa.o randoms.o ssh_md5.o buffer.o packet.o \
-	xmalloc.o ttymodes.o channels.o bufaux.o authfd.o authfile.o crc32.o \
-	rsaglue.o match.o mpaux.o minfd.o $(CIPHER_OBJS)
-SSHD_OBJS = sshd.o $(KRB4_AUTH) auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o pty.o \
-	log-server.o login.o hostfile.o canohost.o servconf.o tildexpand.o \
-	uidswap.o serverloop.o $(RADIX) $(COMMON_OBJS)
-SSH_OBJS = ssh.o sshconnect.o log-client.o readconf.o hostfile.o readpass.o \
-	tildexpand.o uidswap.o clientloop.o canohost.o $(RADIX) $(COMMON_OBJS)
-KEYGEN_OBJS = ssh-keygen.o log-client.o readpass.o rsa.o randoms.o ssh_md5.o \
-	buffer.o xmalloc.o authfile.o $(CIPHER_OBJS) mpaux.o \
-	bufaux.o $(LIBOBJS)
-AGENT_OBJS = ssh-agent.o log-client.o rsa.o randoms.o ssh_md5.o buffer.o \
-	xmalloc.o bufaux.o authfd.o authfile.o rsaglue.o $(CIPHER_OBJS) \
-	mpaux.o minfd.o $(LIBOBJS)
-ADD_OBJS = ssh-add.o log-client.o readpass.o rsa.o randoms.o ssh_md5.o buffer.o \
-	xmalloc.o bufaux.o authfd.o authfile.o $(CIPHER_OBJS) \
-	mpaux.o minfd.o $(LIBOBJS)
-SCP_OBJS = scp.o xmalloc.o
-GEN_MINFD_OBJS = gen_minfd.o $(LIBOBJS)
-
-USER_SHELLS = sh jsh ksh csh tcsh bash zsh ash
-
-SRCS = $(SSHD_OBJS:.o=.c) $(SSH_OBJS:.o=.c) $(KEYGEN_OBJS:.o=.c) \
-	$(AGENT_OBJS:.o=.c) $(ADD_OBJS:.o=.c) \
-	$(SCP_OBJS:.o=.c) \
-	$(GEN_MINFD_OBJS:.o=.c)
-EXTRA_SRCS = memmove.c strerror.c remove.c random.c putenv.c osfc2.c \
-	socketpair.c
-MAN1PAGES = ssh-keygen.1 ssh-agent.1 ssh-add.1 scp.1
-MAN1GENERATED = ssh.1
-MAN1SOURCES = ssh.1.in ssh-keygen.1 ssh-agent.1 ssh-add.1 scp.1
-MAN8GENERATED = sshd.8
-MAN8SOURCES = sshd.8.in
-
-DISTFILES = COPYING.Ylonen README.AFS-KERBEROS README README.SECURID \
-	INSTALL TODO OVERVIEW \
-	configure configure.in config.guess config.sub Makefile.in \
-	ssh-askpass.wish host_config.sample config.sample \
-	acconfig.h config.h.in server_config.sample \
-	$(MAN1SOURCES) $(MAN8SOURCES) *.c *.h install-sh \
-	RFC.nroff RFC \
-	ChangeLog
-
-DISTNAME = `sed 's/.*"\(.*\)".*/\1/' version.h`
-
-NORMAL_PROGRAMS = ssh-keygen ssh-askpass ssh-agent ssh-add scp
-
-SBIN_PROGRAMS = sshd
-PROGRAMS = ssh $(SBIN_PROGRAMS) $(NORMAL_PROGRAMS)
-SSH_PROGRAM = $(bindir)/ssh
-
-all: $(PROGRAMS)
-
-RFC: RFC.nroff rfc-pg
-	tbl RFC.nroff | nroff -ms | sed 's/FORMFEED\[Page/        [Page/' | ./rfc-pg -n5 >RFC
-
-rfc-pg: rfc-pg.c
-	$(CC) -o rfc-pg rfc-pg.c
-
-.c.o:
-	$(CC) -c -I. $(KRB4_INCS) $(GMPINCS) $(ZINCS) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" $(CFLAGS) $<
-
-sshd: $(SSHD_OBJS)  $(RSAREFDEP)
-	-rm -f sshd
-	$(CC) $(LDFLAGS) -o sshd $(SSHD_OBJS) $(GMPLIBS) $(ZLIBLIBS) $(KRB4_LIBS) $(LIBS)
-
-ssh: $(SSH_OBJS)  $(RSAREFDEP)
-	-rm -f ssh
-	$(CC) $(LDFLAGS) -o ssh $(SSH_OBJS) $(GMPLIBS) $(ZLIBLIBS) $(KRB4_LIBS) $(LIBS)
-
-ssh-keygen: $(KEYGEN_OBJS)  $(RSAREFDEP)
-	-rm -f ssh-keygen
-	$(CC) $(LDFLAGS) -o ssh-keygen $(KEYGEN_OBJS) $(GMPLIBS) $(KRB4_LIBS) $(LIBS)
-
-ssh-agent: $(AGENT_OBJS)  $(RSAREFDEP)
-	-rm -f ssh-agent
-	$(CC) $(LDFLAGS) -o ssh-agent $(AGENT_OBJS) $(GMPLIBS) $(KRB4_LIBS) $(LIBS)
-
-ssh-add: $(ADD_OBJS)  $(RSAREFDEP)
-	-rm -f ssh-add
-	$(CC) $(LDFLAGS) -o ssh-add $(ADD_OBJS) $(GMPLIBS) $(KRB4_LIBS) $(LIBS)
-
-scp: $(SCP_OBJS) $(LIBOBJS)
-	-rm -f scp
-	$(CC) $(LDFLAGS) -o scp $(SCP_OBJS) $(LIBOBJS) $(KRB4_LIBS) $(LIBS)
-
-ssh-askpass: ssh-askpass.wish
-	-rm -f ssh-askpass
-	echo "#! $(WISH) -f" >ssh-askpass
-	cat $(srcdir)/ssh-askpass.wish >>ssh-askpass
-	chmod +x ssh-askpass
-
-gen_minfd: $(GEN_MINFD_OBJS)
-	$(CC) $(LDFLAGS) -o gen_minfd $(GEN_MINFD_OBJS) $(LIBS)
-
-minfd.o: minfd.h
-minfd.h: gen_minfd
-	rm -f minfd.h minfd.h~
-	./gen_minfd $(USER_SHELLS) > minfd.h~
-	mv -f minfd.h~ minfd.h
-
-$(RSAREFSRCDIR)/librsaref.a:
-	-if test '!' -d $(RSAREFDIR); then \
-	  (cd $(srcdir); tar cf - $(RSAREFSRCDIR)) | tar xf -; fi
-	cd $(RSAREFSRCDIR); $(MAKE) -f ../../Makefile librsaref.a
-
-RSAREFSRCS = desc.c digit.c md2c.c md5c.c nn.c prime.c r_dh.c r_encode.c \
-	r_enhanc.c r_keygen.c r_random.c r_stdlib.c rsa.c
-
-# Note: this target is used in a recursive make, with VPATH pointing to source
-librsaref.a:
-	for i in $(RSAREFSRCS); do $(CC) $(CFLAGS) -c $$i; done
-	$(AR) rc librsaref.a $(RSAREFSRCS:.c=.o)
-	$(RANLIB) librsaref.a
-
-# Creates /etc/ssh_host_key
-generate-host-key:
-	-@if test -f $(install_prefix)$(HOST_KEY_FILE); \
-          then echo "You already have a host key in $(install_prefix)$(HOST_KEY_FILE)."; \
-	  else \
-	    umask 022; echo "Generating 1024 bit host key."; \
-	    ./ssh-keygen -b 1024 -f $(install_prefix)$(HOST_KEY_FILE) -N ''; \
-	  fi
-
-# Creates install directories
-make-dirs:
-	-umask 022; if test '!' -d $(install_prefix)$(prefix); then \
-	  mkdir $(install_prefix)$(prefix); fi; \
-	if test '!' -d $(install_prefix)$(exec_prefix); then \
-	  mkdir $(install_prefix)$(exec_prefix); fi; \
-	if test '!' -d $(install_prefix)$(etcdir); then \
-	  mkdir $(install_prefix)$(etcdir); fi; \
-	if test '!' -d $(install_prefix)$(bindir); then \
-	  mkdir $(install_prefix)$(bindir); fi; \
-	if test '!' -d $(install_prefix)$(sbindir); then \
-	  mkdir $(install_prefix)$(sbindir); fi; \
-	if test '!' -d $(install_prefix)$(mandir); then \
-	  mkdir $(install_prefix)$(mandir); fi; \
-	if test '!' -d $(install_prefix)$(man1dir); then \
-	  mkdir $(install_prefix)$(man1dir); fi; \
-	if test '!' -d $(install_prefix)$(man8dir); then \
-	  mkdir $(install_prefix)$(man8dir); fi
-
-# Ssh is much to large and hairy to be installed suid root by
-# default. Disabled for now/bg. If you really need rhosts
-# authentication do a manual chmod u+s $(install_prefix)$(bindir)/ssh.
-#
-# Ssh is preferably installed suid root.  It can also be used non-root,
-# but then it cannot connect from a privileged socket, and rhosts
-# authentication will be disabled.
-#
-# Sshd is not suid root, but should preferably be run as root
-# (otherwise it can only log in as the user it runs as, and must be
-# bound to a non-privileged port).  Also, password authentication may
-# not be available if non-root and using shadow passwords.
-install: $(PROGRAMS) make-dirs generate-host-key
-	$(INSTALL_PROGRAM) -o root -m 0755 ssh $(install_prefix)$(bindir)/ssh
-	-if test "`echo ssh | sed '$(transform)'`" '!=' ssh; then \
-	  rm -f $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; \
-	  $(LN_S) ssh \
-	    $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; fi
-	rm -f $(install_prefix)$(bindir)/slogin
-	$(LN_S) ssh $(install_prefix)$(bindir)/slogin
-	-if test "`echo slogin | sed '$(transform)'`" '!=' slogin; then \
-	  rm -f $(install_prefix)$(bindir)/`echo slogin | sed '$(transform)'`;\
-	  $(LN_S) ssh \
-	    $(install_prefix)$(bindir)/`echo slogin | sed '$(transform)'`; fi
-	-for p in $(NORMAL_PROGRAMS); do \
-	  $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(bindir)/$$p; \
-	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-	    rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \
-	    $(LN_S) $$p \
-	      $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; fi; \
-	done
-# Remove $(etcdir)/sshd_pid as it is now $(bindir)/sshd.pid
-	-rm -f $(install_prefix)$(etcdir)/sshd_pid
-# Remove $(bindir)/sshd to avoid confusion since it is now in $(sbindir)
-	-rm -f $(install_prefix)$(bindir)/sshd
-	-rm -f $(install_prefix)$(bindir)/`echo sshd | sed '$(transform)'`
-	-for p in $(SBIN_PROGRAMS); do \
-	  $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(sbindir)/$$p; \
-	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-	    rm -f $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`;\
-	    $(LN_S) $$p \
-	      $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; fi;\
-	done
-	-for p in $(MAN1PAGES); do \
-	  $(INSTALL_DATA) -m 0644 $(srcdir)/$$p $(install_prefix)$(man1dir)/$$p ; \
-	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-	    rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\
-	    $(LN_S) $$p \
-	      $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`; \
-	  fi; \
-	done
-	rm -f $(install_prefix)$(man1dir)/slogin.1
-	$(LN_S) ssh.1 $(install_prefix)$(man1dir)/slogin.1
-	if test "`echo slogin.1 | sed '$(transform)'`" '!=' slogin.1; then \
-	  rm -f $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`;\
-	  $(LN_S) ssh.1 \
-	    $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`; \
-	fi
-	-for p in $(MAN1GENERATED); do \
-	  $(INSTALL_DATA) -m 0644 $$p $(install_prefix)$(man1dir)/$$p ; \
-	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-	    rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\
-	    $(LN_S) $$p \
-	      $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`; \
-	  fi; \
-	done
-	-for p in $(MAN8GENERATED); do \
-	  $(INSTALL_DATA) -m 0644 $$p $(install_prefix)$(man8dir)/$$p; \
-	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-	    rm -f $(install_prefix)$(man8dir)/`echo $$p | sed '$(transform)'`;\
-	    $(LN_S) $$p \
-	      $(install_prefix)$(man8dir)/`echo $$p | sed '$(transform)'`; fi;\
-	done
-	-if test '!' -f $(install_prefix)$(HOST_CONFIG_FILE); then \
-	  $(INSTALL_DATA) -m 0644 $(srcdir)/host_config.sample \
-	    $(install_prefix)$(HOST_CONFIG_FILE); fi
-	-if test '!' -f $(install_prefix)$(SERVER_CONFIG_FILE); then \
-	  cat $(srcdir)/server_config.sample | \
-	  sed "s#_ETCDIR_#$(etcdir)#g" >/tmp/ssh_inst.$$; \
-	  $(INSTALL_DATA) -m 0644 /tmp/ssh_inst.$$ \
-	    $(install_prefix)$(SERVER_CONFIG_FILE); \
-	  rm -f /tmp/ssh_inst.$$; fi
-
-uninstall:
-	for p in ssh $(NORMAL_PROGRAMS); do \
-	  rm -f $(install_prefix)$(bindir)/$$p; \
-	  rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \
-	done
-	for p in $(SBIN_PROGRAMS); do \
-	  rm -f $(install_prefix)$(sbindir)/$$p; \
-	  rm -f $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; \
-	done
-	rm -f $(install_prefix)$(bindir)/slogin
-	rm -f $(install_prefix)$(bindir)/`echo slogin | sed '$(transform)'`
-	for p in $(MAN1PAGES) $(MAN1GENERATED); do \
-	  rm -f $(install_prefix)$(man1dir)/$$p; \
-	  rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`; \
-	done
-	for p in $(MAN8GENERATED); do \
-	  rm -f $(install_prefix)$(man8dir)/$$p; \
-	  rm -f $(install_prefix)$(man8dir)/`echo $$p | sed '$(transform)'`; \
-	done
-
-clean:
-	-rm -f *.o minfd.h gmon.out core $(PROGRAMS) gen_minfd rfc-pg
-#	cd $(RSAREFSRCDIR); rm -f *.o *.a
-
-distclean: clean
-	-rm -f Makefile config.status config.cache config.log config.h
-	-rm -f ssh.1 sshd.8
-
-dist:
-	-rm -rf $(DISTNAME)
-	-mkdir $(DISTNAME)
-	cp $(DISTFILES) $(DISTNAME)
-	-rm -f $(DISTNAME)/config.h
-#	tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
-#	cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
-	tar cf $(DISTNAME).tar $(DISTNAME)
-	-rm -f $(DISTNAME).tar.gz
-	gzip $(DISTNAME).tar
-	rm -rf $(DISTNAME)
-	@echo Distribution left in $(DISTNAME).tar.gz
-#	@echo Incrementing version number...
-#	@old_version=`sed 's/.*\.\([0-9][0-9]*\)"$$/\1/' version.h`; \
-#	 new_version=`expr $$old_version + 1`; \
-#	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed version.h >/dev/null
-
-depend:
-	$(MAKEDEP) -I$(srcdir) -I. $(GMPINCS) $(ZINCS) $(DEFS) $(SRCS)
diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc
new file mode 100644
index 00000000000..7cd77c4911d
--- /dev/null
+++ b/usr.bin/ssh/Makefile.inc
@@ -0,0 +1,7 @@
+HOST_KEY_FILE   = $(etcdir)/ssh_host_key
+HOST_CONFIG_FILE = $(etcdir)/ssh_config
+SERVER_CONFIG_FILE = $(etcdir)/sshd_config
+
+CFLAGS=	-I${.OBJDIR} -I${.CURDIR}/..
+
+USER_SHELLS = sh jsh ksh csh tcsh bash zsh ash
diff --git a/usr.bin/ssh/RFC b/usr.bin/ssh/RFC
deleted file mode 100644
index 91195b16255..00000000000
--- a/usr.bin/ssh/RFC
+++ /dev/null
@@ -1,2187 +0,0 @@
-
-
-
-
-
-
-Network Working Group                                          T. Ylonen
-Internet-Draft                         Helsinki University of Technology
-draft-ylonen-ssh-protocol-00.txt                        15 November 1995
-Expires: 15 May 1996
-
-
-               The SSH (Secure Shell) Remote Login Protocol
-
-Status of This Memo
-
-   This document is an Internet-Draft.   Internet-Drafts  are  working
-   documents of the Internet Engineering Task Force (IETF), its areas,
-   and its working groups.  Note that other groups may also distribute
-   working documents as Internet-Drafts.
-
-   Internet-Drafts are draft documents valid  for  a  maximum  of  six
-   months  and  may  be updated, replaced, or obsoleted by other docu-
-   ments at any time.  It is inappropriate to use  Internet-Drafts  as
-   reference  material  or  to  cite them other than as ``work in pro-
-   gress.''
-
-   To learn the current status of any Internet-Draft, please check the
-   ``1id-abstracts.txt'' listing contained in the Internet- Drafts
-   Shadow Directories on ftp.is.co.za (Africa), nic.nordu.net (Europe),
-   munnari.oz.au (Pacific Rim), ds.internic.net (US East Coast), or
-   ftp.isi.edu (US West Coast).
-
-   The distribution of  this  memo  is  unlimited.
-
-Introduction
-
-   SSH (Secure Shell) is a program to log into another computer over a
-   network, to execute commands in a remote machine, and to move files
-   from one machine to another.  It provides strong authentication and
-   secure communications over insecure networks.  Its features include
-   the following:
-
-   o    Closes several security holes (e.g., IP, routing, and DNS spoof-
-        ing).  New authentication methods: .rhosts together with RSA
-        [RSA] based host authentication, and pure RSA authentication.
-
-   o    All communications are automatically and transparently
-        encrypted.  Encryption is also used to protect integrity.
-
-   o    X11 connection forwarding provides secure X11 sessions.
-
-   o    Arbitrary TCP/IP ports can be redirected over the encrypted
-        channel in both directions.
-
-
-
-Ylonen                                                          [Page 1]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   o    Client RSA-authenticates the server machine in the beginning of
-        every connection to prevent trojan horses (by routing or DNS
-        spoofing) and man-in-the-middle attacks, and the server RSA-
-        authenticates the client machine before accepting .rhosts or
-        /etc/hosts.equiv authentication (to prevent DNS, routing, or IP
-        spoofing).
-
-   o    An authentication agent, running in the user's local workstation
-        or laptop, can be used to hold the user's RSA authentication
-        keys.
-
-   The goal has been to make the software as easy to use as possible for
-   ordinary users.  The protocol has been designed to be as secure as
-   possible while making it possible to create implementations that are
-   easy to use and install.  The sample implementation has a number of
-   convenient features that are not described in this document as they
-   are not relevant for the protocol.
-
-
-Overview of the Protocol
-
-   The software consists of a server program running on a server
-   machine, and a client program running on a client machine (plus a few
-   auxiliary programs).  The machines are connected by an insecure IP
-   [RFC0791] network (that can be monitored, tampered with, and spoofed
-   by hostile parties).
-
-   A connection is always initiated by the client side.  The server
-   listens on a specific port waiting for connections.  Many clients may
-   connect to the same server machine.
-
-   The client and the server are connected via a TCP/IP [RFC0793] socket
-   that is used for bidirectional communication.  Other types of tran-
-   sport can be used but are currently not defined.
-
-   When the client connects the server, the server accepts the connec-
-   tion and responds by sending back its version identification string.
-   The client parses the server's identification, and sends its own
-   identification.  The purpose of the identification strings is to
-   validate that the connection was to the correct port, declare the
-   protocol version number used, and to declare the software version
-   used on each side (for debugging purposes).  The identification
-   strings are human-readable.  If either side fails to understand or
-   support the other side's version, it closes the connection.
-
-   After the protocol identification phase, both sides switch to a
-   packet based binary protocol.  The server starts by sending its host
-   key (every host has an RSA key used to authenticate the host), server
-
-
-
-Ylonen                                                          [Page 2]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   key (an RSA key regenerated every hour), and other information to the
-   client.  The client then generates a 256 bit session key, encrypts it
-   using both RSA keys (see below for details), and sends the encrypted
-   session key and selected cipher type to the server.  Both sides then
-   turn on encryption using the selected algorithm and key.  The server
-   sends an encrypted confirmation message to the client.
-
-   The client then authenticates itself using any of a number of authen-
-   tication methods.  The currently supported authentication methods are
-   .rhosts or /etc/hosts.equiv authentication (disabled by default), the
-   same with RSA-based host authentication, RSA authentication, and
-   password authentication.
-
-   After successful authentication, the client makes a number of
-   requests to prepare for the session.  Typical requests include allo-
-   cating a pseudo tty, starting X11 [X11] or TCP/IP port forwarding,
-   starting authentication agent forwarding, and executing the shell or
-   a command.
-
-   When a shell or command is executed, the connection enters interac-
-   tive session mode.  In this mode, data is passed in both directions,
-   new forwarded connections may be opened, etc.  The interactive ses-
-   sion normally terminates when the server sends the exit status of the
-   program to the client.
-
-
-   The protocol makes several reservations for future extensibility.
-   First of all, the initial protocol identification messages include
-   the protocol version number.  Second, the first packet by both sides
-   includes a protocol flags field, which can be used to agree on exten-
-   sions in a compatible manner.  Third, the authentication and session
-   preparation phases work so that the client sends requests to the
-   server, and the server responds with success or failure.  If the
-   client sends a request that the server does not support, the server
-   simply returns failure for it.  This permits compatible addition of
-   new authentication methods and preparation operations.  The interac-
-   tive session phase, on the other hand, works asynchronously and does
-   not permit the use of any extensions (because there is no easy and
-   reliable way to signal rejection to the other side and problems would
-   be hard to debug).  Any compatible extensions to this phase must be
-   agreed upon during any of the earlier phases.
-
-The Binary Packet Protocol
-
-   After the protocol identification strings, both sides only send spe-
-   cially formatted packets.  The packet layout is as follows:
-
-   o    Packet length: 32 bit unsigned integer, coded as four 8-bit
-
-
-
-Ylonen                                                          [Page 3]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        bytes, msb first.  Gives the length of the packet, not including
-        the length field and padding.  The maximum length of a packet
-        (not including the length field and padding) is 262144 bytes.
-
-   o    Padding: 1-8 bytes of random data (or zeroes if not encrypting).
-        The amount of padding is (8 - (length % 8)) bytes (where %
-        stands for the modulo operator).  The rationale for always hav-
-        ing some random padding at the beginning of each packet is to
-        make known plaintext attacks more difficult.
-
-   o    Packet type: 8-bit unsigned byte.  The value 255 is reserved for
-        future extension.
-
-   o    Data: binary data bytes, depending on the packet type.  The
-        number of data bytes is the "length" field minus 5.
-
-   o    Check bytes: 32-bit crc, four 8-bit bytes, msb first.  The crc
-        is the Cyclic Redundancy Check, with the polynomial 0xedb88320,
-        of the Padding, Packet type, and Data fields.  The crc is com-
-        puted before any encryption.
-
-   The packet, except for the length field, may be encrypted using any
-   of a number of algorithms.  The length of the encrypted part (Padding
-   + Type + Data + Check) is always a multiple of 8 bytes.  Typically
-   the cipher is used in a chained mode, with all packets chained
-   together as if it was a single data stream (the length field is never
-   included in the encryption process).  Details of encryption are
-   described below.
-
-   When the session starts, encryption is turned off.  Encryption is
-   enabled after the client has sent the session key.  The encryption
-   algorithm to use is selected by the client.
-
-
-Packet Compression
-
-   If compression is supported (it is an optional feature, see
-   SSH_CMSG_REQUEST_COMPRESSION below), the packet type and data fields
-   of the packet are compressed using the gzip deflate algorithm [GZIP].
-   If compression is in effect, the packet length field indicates the
-   length of the compressed data, plus 4 for the crc.  The amount of
-   padding is computed from the compressed data, so that the amount of
-   data to be encrypted becomes a multiple of 8 bytes.
-
-   When compressing, the packets (type + data portions) in each direc-
-   tion are compressed as if they formed a continuous data stream, with
-   only the current compression block flushed between packets.  This
-   corresponds to the GNU ZLIB library Z_PARTIAL_FLUSH option.  The
-
-
-
-Ylonen                                                          [Page 4]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   compression dictionary is not flushed between packets.  The two
-   directions are compressed independently of each other.
-
-
-Packet Encryption
-
-   The protocol supports several encryption methods.  During session
-   initialization, the server sends a bitmask of all encryption methods
-   that it supports, and the client selects one of these methods.  The
-   client also generates a 256-bit random session key (32 8-bit bytes)
-   and sends it to the server.
-
-   The encryption methods supported by the current implementation, and
-   their codes are:
-
-          SSH_CIPHER_NONE   0      No encryption
-          SSH_CIPHER_IDEA   1      IDEA in CFB mode
-          SSH_CIPHER_DES    2      DES in CBC mode
-          SSH_CIPHER_3DES   3      Triple-DES in CBC mode
-          SSH_CIPHER_TSS    4      An experimental stream cipher
-          SSH_CIPHER_RC4    5      RC4
-
-
-   All implementations are required to support SSH_CIPHER_DES and
-   SSH_CIPHER_3DES.  Supporting SSH_CIPHER_IDEA, SSH_CIPHER_RC4, and
-   SSH_CIPHER_NONE is recommended.  Support for SSH_CIPHER_TSS is
-   optional (and it is not described in this document).  Other ciphers
-   may be added at a later time; support for them is optional.
-
-   For encryption, the encrypted portion of the packet is considered a
-   linear byte stream.  The length of the stream is always a multiple of
-   8.  The encrypted portions of consecutive packets (in the same direc-
-   tion) are encrypted as if they were a continuous buffer (that is, any
-   initialization vectors are passed from the previous packet to the
-   next packet).  Data in each direction is encrypted independently.
-
-   SSH_CIPHER_DES
-        The key is taken from the first 8 bytes of the session key.  The
-        least significant bit of each byte is ignored.  This results in
-        56 bits of key data.  DES [DES] is used in CBC mode.  The iv
-        (initialization vector) is initialized to all zeroes.
-
-   SSH_CIPHER_3DES
-        The variant of triple-DES used here works as follows: there are
-        three independent DES-CBC ciphers, with independent initializa-
-        tion vectors.  The data (the whole encrypted data stream) is
-        first encrypted with the first cipher, then decrypted with the
-        second cipher, and finally encrypted with the third cipher.  All
-
-
-
-Ylonen                                                          [Page 5]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        these operations are performed in CBC mode.
-
-        The key for the first cipher is taken from the first 8 bytes of
-        the session key; the key for the next cipher from the next 8
-        bytes, and the key for the third cipher from the following 8
-        bytes.  All three initialization vectors are initialized to
-        zero.
-
-        (Note: the variant of 3DES used here differs from some other
-        descriptions.)
-
-   SSH_CIPHER_IDEA
-        The key is taken from the first 16 bytes of the session key.
-        IDEA [IDEA] is used in CFB mode.  The initialization vector is
-        initialized to all zeroes.
-
-   SSH_CIPHER_TSS
-        All 32 bytes of the session key are used as the key.
-
-        There is no reference available for the TSS algorithm; it is
-        currently only documented in the sample implementation source
-        code.  The security of this cipher is unknown (but it is quite
-        fast).  The cipher is basically a stream cipher that uses MD5 as
-        a random number generator and takes feedback from the data.
-
-   SSH_CIPHER_RC4
-        The first 16 bytes of the session key are used as the key for
-        the server to client direction.  The remaining 16 bytes are used
-        as the key for the client to server direction.  This gives
-        independent 128-bit keys for each direction.
-
-        This algorithm is the alleged RC4 cipher posted to the Usenet in
-        1995.  It is widely believed to be equivalent with the original
-        RSADSI RC4 cipher.  This is a very fast algorithm.
-
-
-Data Type Encodings
-
-   The Data field of each packet contains data encoded as described in
-   this section.  There may be several data items; each item is coded as
-   described here, and their representations are concatenated together
-   (without any alignment or padding).
-
-   Each data type is stored as follows:
-
-   8-bit byte
-        The byte is stored directly as a single byte.
-
-
-
-
-Ylonen                                                          [Page 6]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   32-bit unsigned integer
-        Stored in 4 bytes, msb first.
-
-   Arbitrary length binary string
-        First 4 bytes are the length of the string, msb first (not
-        including the length itself).  The following "length" bytes are
-        the string value.  There are no terminating null characters.
-
-   Multiple-precision integer
-        First 2 bytes are the number of bits in the integer, msb first
-        (for example, the value 0x00012345 would have 17 bits).  The
-        value zero has zero bits.  It is permissible that the number of
-        bits be larger than the real number of bits.
-
-        The number of bits is followed by (bits + 7) / 8 bytes of binary
-        data, msb first, giving the value of the integer.
-
-
-TCP/IP Port Number and Other Options
-
-   The server listens for connections on TCP/IP port 22.
-
-   The client may connect the server from any port.  However, if the
-   client wishes to use any form of .rhosts or /etc/hosts.equiv authen-
-   tication, it must connect from a privileged port (less than 1024).
-
-   For the IP Type of Service field [RFC0791], it is recommended that
-   interactive sessions (those having a user terminal or forwarding X11
-   connections) use the IPTOS_LOWDELAY, and non-interactive connections
-   use IPTOS_THROUGHPUT.
-
-   It is recommended that keepalives are used, because otherwise pro-
-   grams on the server may never notice if the other end of the connec-
-   tion is rebooted.
-
-
-Protocol Version Identification
-
-   After the socket is opened, the server sends an identification
-   string, which is of the form "SSH-<protocolmajor>.<protocolminor>-
-   <version>\n", where <protocolmajor> and <protocolminor> are integers
-   and specify the protocol version number (not software distribution
-   version).  <version> is server side software version string (max 40
-   characters); it is not interpreted by the remote side but may be use-
-   ful for debugging.
-
-   The client parses the server's string, and sends a corresponding
-   string with its own information in response.  If the server has lower
-
-
-
-Ylonen                                                          [Page 7]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   version number, and the client contains special code to emulate it,
-   the client responds with the lower number; otherwise it responds with
-   its own number.  The server then compares the version number the
-   client sent with its own, and determines whether they can work
-   together.  The server either disconnects, or sends the first packet
-   using the binary packet protocol and both sides start working accord-
-   ing to the lower of the protocol versions.
-
-   By convention, changes which keep the protocol compatible with previ-
-   ous versions keep the same major protocol version; changes that are
-   not compatible increment the major version (which will hopefully
-   never happen).  The version described in this document is 1.3.
-
-   The client will
-
-Key Exchange and Server Host Authentication
-
-   The first message sent by the server using the packet protocol is
-   SSH_SMSG_PUBLIC_KEY.  It declares the server's host key, server pub-
-   lic key, supported ciphers, supported authentication methods, and
-   flags for protocol extensions.  It also contains a 64-bit random
-   number (cookie) that must be returned in the client's reply (to make
-   IP spoofing more difficult).  No encryption is used for this message.
-
-   Both sides compute a session id as follows.  The modulus of the
-   server key is interpreted as a byte string (without explicit length
-   field, with minimum length able to hold the whole value), most signi-
-   ficant byte first.  This string is concatenated with the server host
-   key interpreted the same way.  Additionally, the cookie is con-
-   catenated with this.  Both sides compute MD5 of the resulting string.
-   The resulting 16 bytes (128 bits) are stored by both parties and are
-   called the session id.
-
-   The client responds with a SSH_CMSG_SESSION_KEY message, which con-
-   tains the selected cipher type, a copy of the 64-bit cookie sent by
-   the server, client's protocol flags, and a session key encrypted with
-   both the server's host key and server key.  No encryption is used for
-   this message.
-
-   The session key is 32 8-bit bytes (a total of 256 random bits gen-
-   erated by the client).  The client first xors the 16 bytes of the
-   session id with the first 16 bytes of the session key.  The resulting
-   string is then encrypted using the smaller key (one with smaller
-   modulus), and the result is then encrypted using the other key.  The
-   number of bits in the public modulus of the two keys must differ by
-   at least 128 bits.
-
-   At each encryption step, a multiple-precision integer is constructed
-
-
-
-Ylonen                                                          [Page 8]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   from the data to be encrypted as follows (the integer is here inter-
-   preted as a sequence of bytes, msb first; the number of bytes is the
-   number of bytes needed to represent the modulus).
-
-   The most significant byte (which is only partial as the value must be
-   less than the public modulus, which is never a power of two) is zero.
-
-   The next byte contains the value 2 (which stands for public-key
-   encrypted data in the PKCS standard [PKCS#1]).  Then, there are non-
-   zero random bytes to fill any unused space, a zero byte, and the data
-   to be encrypted in the least significant bytes, the last byte of the
-   data in the least significant byte.
-
-   This algorithm is used twice.  First, it is used to encrypt the 32
-   random bytes generated by the client to be used as the session key
-   (xored by the session id).  This value is converted to an integer as
-   described above, and encrypted with RSA using the key with the
-   smaller modulus.  The resulting integer is converted to a byte
-   stream, msb first.  This byte stream is padded and encrypted identi-
-   cally using the key with the larger modulus.
-
-   After the client has sent the session key, it starts to use the
-   selected algorithm and key for decrypting any received packets, and
-   for encrypting any sent packets.  Separate ciphers are used for dif-
-   ferent directions (that is, both directions have separate initializa-
-   tion vectors or other state for the ciphers).
-
-   When the server has received the session key message, and has turned
-   on encryption, it sends a SSH_SMSG_SUCCESS message to the client.
-
-   The recommended size of the host key is 1024 bits, and 768 bits for
-   the server key.  The minimum size is 512 bits for the smaller key.
-
-
-Declaring the User Name
-
-   The client then sends a SSH_CMSG_USER message to the server.  This
-   message specifies the user name to log in as.
-
-   The server validates that such a user exists, checks whether authen-
-   tication is needed, and responds with either SSH_SMSG_SUCCESS or
-   SSH_SMSG_FAILURE.  SSH_SMSG_SUCCESS indicates that no authentication
-   is needed for this user (no password), and authentication phase has
-   now been completed.  SSH_SMSG_FAILURE indicates that authentication
-   is needed (or the user does not exist).
-
-   If the user does not exist, it is recommended that this returns
-   failure, but the server keeps reading messages from the client, and
-
-
-
-Ylonen                                                          [Page 9]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   responds to any messages (except SSH_MSG_DISCONNECT, SSH_MSG_IGNORE,
-   and SSH_MSG_DEBUG) with SSH_SMSG_FAILURE.  This way the client cannot
-   be certain whether the user exists.
-
-
-Authentication Phase
-
-   Provided the server didn't immediately accept the login, an authenti-
-   cation exchange begins.  The client sends messages to the server
-   requesting different types of authentication in arbitrary order as
-   many times as desired (however, the server may close the connection
-   after a timeout).  The server always responds with SSH_SMSG_SUCCESS
-   if it has accepted the authentication, and with SSH_SMSG_FAILURE if
-   it has denied authentication with the requested method or it does not
-   recognize the message.  Some authentication methods cause an exchange
-   of further messages before the final result is sent.  The authentica-
-   tion phase ends when the server responds with success.
-
-   The recommended value for the authentication timeout (timeout before
-   disconnecting if no successful authentication has been made) is 5
-   minutes.
-
-   The following authentication methods are currently supported:
-
-      SSH_AUTH_RHOSTS       1   .rhosts or /etc/hosts.equiv
-      SSH_AUTH_RSA          2   pure RSA authentication
-      SSH_AUTH_PASSWORD     3   password authentication
-      SSH_AUTH_RHOSTS_RSA   4   .rhosts with RSA host authentication
-
-
-   SSH_AUTH_RHOSTS
-
-        This is the authentication method used by rlogin and rsh
-        [RFC1282].
-
-        The client sends SSH_CMSG_AUTH_RHOSTS with the client-side user
-        name as an argument.
-
-        The server checks whether to permit authentication.  On UNIX
-        systems, this is usually done by checking /etc/hosts.equiv, and
-        .rhosts in the user's home directory.  The connection must come
-        from a privileged port.
-
-        It is recommended that the server checks that there are no IP
-        options (such as source routing) specified for the socket before
-        accepting this type of authentication.  The client host name
-        should be reverse-mapped and then forward mapped to ensure that
-        it has the proper IP-address.
-
-
-
-Ylonen                                                         [Page 10]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        This authentication method trusts the remote host (root on the
-        remote host can pretend to be any other user on that host), the
-        name services, and partially the network: anyone who can see
-        packets coming out from the server machine can do IP-spoofing
-        and pretend to be any machine; however, the protocol prevents
-        blind IP-spoofing (which used to be possible with rlogin).
-
-        Many sites probably want to disable this authentication method
-        because of the fundamental insecurity of conventional .rhosts or
-        /etc/hosts.equiv authentication when faced with spoofing.  It is
-        recommended that this method not be supported by the server by
-        default.
-
-   SSH_AUTH_RHOSTS_RSA
-
-        In addition to conventional .rhosts and hosts.equiv authentica-
-        tion, this method additionally requires that the client host be
-        authenticated using RSA.
-
-        The client sends SSH_CMSG_AUTH_RHOSTS_RSA specifying the
-        client-side user name, and the public host key of the client
-        host.
-
-        The server first checks if normal .rhosts or /etc/hosts.equiv
-        authentication would be accepted, and if not, responds with
-        SSH_SMSG_FAILURE.  Otherwise, it checks whether it knows the
-        host key for the client machine (using the same name for the
-        host that was used for checking the .rhosts and /etc/hosts.equiv
-        files).  If it does not know the RSA key for the client, access
-        is denied and SSH_SMSG_FAILURE is sent.
-
-        If the server knows the host key of the client machine, it veri-
-        fies that the given host key matches that known for the client.
-        If not, access is denied and SSH_SMSG_FAILURE is sent.
-
-        The server then sends a SSH_SMSG_AUTH_RSA_CHALLENGE message con-
-        taining an encrypted challenge for the client.  The challenge is
-        32 8-bit random bytes (256 bits).  When encrypted, the highest
-        (partial) byte is left as zero, the next byte contains the value
-        2, the following are non-zero random bytes, followed by a zero
-        byte, and the challenge put in the remaining bytes.  This is
-        then encrypted using RSA with the client host's public key.
-        (The padding and encryption algorithm is the same as that used
-        for the session key.)
-
-        The client decrypts the challenge using its private host key,
-        concatenates this with the session id, and computes an MD5
-        checksum of the resulting 48 bytes.  The MD5 output is returned
-
-
-
-Ylonen                                                         [Page 11]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        as 16 bytes in a SSH_CMSG_AUTH_RSA_RESPONSE message.  (MD5 is
-        used to deter chosen plaintext attacks against RSA; the session
-        id binds it to a specific session).
-
-        The server verifies that the MD5 of the decrypted challenge
-        returned by the client matches that of the original value, and
-        sends SSH_SMSG_SUCCESS if so.  Otherwise it sends
-        SSH_SMSG_FAILURE and refuses the authentication attempt.
-
-        This authentication method trusts the client side machine in
-        that root on that machine can pretend to be any user on that
-        machine.  Additionally, it trusts the client host key.  The name
-        and/or IP address of the client host is only used to select the
-        public host key.  The same host name is used when scanning
-        .rhosts or /etc/hosts.equiv and when selecting the host key.  It
-        would in principle be possible to eliminate the host name
-        entirely and substitute it directly by the host key.  IP and/or
-        DNS [RFC1034] spoofing can only be used to pretend to be a host
-        for which the attacker has the private host key.
-
-   SSH_AUTH_RSA
-
-        The idea behind RSA authentication is that the server recognizes
-        the public key offered by the client, generates a random chal-
-        lenge, and encrypts the challenge with the public key.  The
-        client must then prove that it has the corresponding private key
-        by decrypting the challenge.
-
-        The client sends SSH_CMSG_AUTH_RSA with public key modulus (n)
-        as an argument.
-
-        The server may respond immediately with SSH_SMSG_FAILURE if it
-        does not permit authentication with this key.  Otherwise it gen-
-        erates a challenge, encrypts it using the user's public key
-        (stored on the server and identified using the modulus), and
-        sends SSH_SMSG_AUTH_RSA_CHALLENGE with the challenge (mp-int) as
-        an argument.
-
-        The challenge is 32 8-bit random bytes (256 bits).  When
-        encrypted, the highest (partial) byte is left as zero, the next
-        byte contains the value 2, the following are non-zero random
-        bytes, followed by a zero byte, and the challenge put in the
-        remaining bytes.  This is then encrypted with the public key.
-        (The padding and encryption algorithm is the same as that used
-        for the session key.)
-
-        The client decrypts the challenge using its private key, con-
-        catenates it with the session id, and computes an MD5 checksum
-
-
-
-Ylonen                                                         [Page 12]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        of the resulting 48 bytes.  The MD5 output is returned as 16
-        bytes in a SSH_CMSG_AUTH_RSA_RESPONSE message.  (Note that the
-        MD5 is necessary to avoid chosen plaintext attacks against RSA;
-        the session id binds it to a specific session.)
-
-        The server verifies that the MD5 of the decrypted challenge
-        returned by the client matches that of the original value, and
-        sends SSH_SMSG_SUCCESS if so.  Otherwise it sends
-        SSH_SMSG_FAILURE and refuses the authentication attempt.
-
-        This authentication method does not trust the remote host, the
-        network, name services, or anything else.  Authentication is
-        based solely on the possession of the private identification
-        keys.  Anyone in possession of the private keys can log in, but
-        nobody else.
-
-        The server may have additional requirements for a successful
-        authentiation.  For example, to limit damage due to a comprom-
-        ised RSA key, a server might restrict access to a limited set of
-        hosts.
-
-   SSH_AUTH_PASSWORD
-
-        The client sends a SSH_CMSG_AUTH_PASSWORD message with the plain
-        text password.  (Note that even though the password is plain
-        text inside the message, it is normally encrypted by the packet
-        mechanism.)
-
-        The server verifies the password, and sends SSH_SMSG_SUCCESS if
-        authentication was accepted and SSH_SMSG_FAILURE otherwise.
-
-        Note that the password is read from the user by the client; the
-        user never interacts with a login program.
-
-        This authentication method does not trust the remote host, the
-        network, name services or anything else.  Authentication is
-        based solely on the possession of the password.  Anyone in pos-
-        session of the password can log in, but nobody else.
-
-Preparatory Operations
-
-   After successful authentication, the server waits for a request from
-   the client, processes the request, and responds with SSH_SMSG_SUCCESS
-   whenever a request has been successfully processed.  If it receives a
-   message that it does not recognize or it fails to honor a request, it
-   returns SSH_SMSG_FAILURE.  It is expected that new message types
-   might be added to this phase in future.
-
-
-
-
-Ylonen                                                         [Page 13]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   The following messages are currently defined for this phase.
-
-   SSH_CMSG_REQUEST_COMPRESSION
-        Requests that compression be enabled for this session.  A gzip-
-        compatible compression level (1-9) is passed as an argument.
-
-   SSH_CMSG_REQUEST_PTY
-        Requests that a pseudo terminal device be allocated for this
-        session.  The user terminal type and terminal modes are supplied
-        as arguments.
-
-   SSH_CMSG_X11_REQUEST_FORWARDING
-        Requests forwarding of X11 connections from the remote machine
-        to the local machine over the secure channel.  Causes an
-        internet-domain socket to be allocated and the DISPLAY variable
-        to be set on the server.  X11 authentication data is automati-
-        cally passed to the server, and the client may implement spoof-
-        ing of authentication data for added security.  The authentica-
-        tion data is passed as arguments.
-
-   SSH_CMSG_PORT_FORWARD_REQUEST
-        Requests forwarding of a TCP/IP port on the server host over the
-        secure channel.  What happens is that whenever a connection is
-        made to the port on the server, a connection will be made from
-        the client end to the specified host/port.  Any user can forward
-        unprivileged ports; only the root can forward privileged ports
-        (as determined by authentication done earlier).
-
-   SSH_CMSG_AGENT_REQUEST_FORWARDING
-        Requests forwarding of the connection to the authentication
-        agent.
-
-   SSH_CMSG_EXEC_SHELL
-        Starts a shell (command interpreter) for the user, and moves
-        into interactive session mode.
-
-   SSH_CMSG_EXEC_CMD
-        Executes the given command (actually "<shell> -c <command>" or
-        equivalent) for the user, and moves into interactive session
-        mode.
-
-
-Interactive Session and Exchange of Data
-
-   During the interactive session, any data written by the shell or com-
-   mand running on the server machine is forwarded to stdin or stderr on
-   the client machine, and any input available from stdin on the client
-   machine is forwarded to the program on the server machine.
-
-
-
-Ylonen                                                         [Page 14]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   All exchange is asynchronous; either side can send at any time, and
-   there are no acknowledgements (TCP/IP already provides reliable tran-
-   sport, and the packet protocol protects against tampering or IP
-   spoofing).
-
-   When the client receives EOF from its standard input, it will send
-   SSH_CMSG_EOF; however, this in no way terminates the exchange.  The
-   exchange terminates and interactive mode is left when the server
-   sends SSH_SMSG_EXITSTATUS to indicate that the client program has
-   terminated.  Alternatively, either side may disconnect at any time by
-   sending SSH_MSG_DISCONNECT or closing the connection.
-
-   The server may send any of the following messages:
-
-   SSH_SMSG_STDOUT_DATA
-        Data written to stdout by the program running on the server.
-        The data is passed as a string argument.  The client writes this
-        data to stdout.
-
-   SSH_SMSG_STDERR_DATA
-        Data written to stderr by the program running on the server.
-        The data is passed as a string argument.  The client writes this
-        data to stderr.  (Note that if the program is running on a tty,
-        it is not possible to separate stdout and stderr data, and all
-        data will be sent as stdout data.)
-
-   SSH_SMSG_EXITSTATUS
-        Indicates that the shell or command has exited.  Exit status is
-        passed as an integer argument.  This message causes termination
-        of the interactive session.
-
-   SSH_SMSG_AGENT_OPEN
-        Indicates that someone on the server side is requesting a con-
-        nection to the authentication agent.  The server-side channel
-        number is passed as an argument.  The client must respond with
-        either SSH_CHANNEL_OPEN_CONFIRMATION or
-        SSH_CHANNEL_OPEN_FAILURE.
-
-   SSH_SMSG_X11_OPEN
-        Indicates that a connection has been made to the X11 socket on
-        the server side and should be forwarded to the real X server.
-        An integer argument indicates the channel number allocated for
-        this connection on the server side.  The client should send back
-        either SSH_MSG_CHANNEL_OPEN_CONFIRMATION or
-        SSH_MSG_CHANNEL_OPEN_FAILURE with the same server side channel
-        number.
-
-   SSH_MSG_PORT_OPEN
-
-
-
-Ylonen                                                         [Page 15]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        Indicates that a connection has been made to a port on the
-        server side for which forwarding has been requested.  Arguments
-        are server side channel number, host name to connect to, and
-        port to connect to.  The client should send back either
-        SSH_MSG_CHANNEL_OPEN_CONFIRMATION or
-        SSH_MSG_CHANNEL_OPEN_FAILURE with the same server side channel
-        number.
-
-   SSH_MSG_CHANNEL_OPEN_CONFIRMATION
-        This is sent by the server to indicate that it has opened a con-
-        nection as requested in a previous message.  The first argument
-        indicates the client side channel number, and the second argu-
-        ment is the channel number that the server has allocated for
-        this connection.
-
-   SSH_MSG_CHANNEL_OPEN_FAILURE
-        This is sent by the server to indicate that it failed to open a
-        connection as requested in a previous message.  The client-side
-        channel number is passed as an argument.  The client will close
-        the descriptor associated with the channel and free the channel.
-
-   SSH_MSG_CHANNEL_DATA
-        This packet contains data for a channel from the server.  The
-        first argument is the client-side channel number, and the second
-        argument (a string) is the data.
-
-   SSH_MSG_CHANNEL_CLOSE
-        This is sent by the server to indicate that whoever was in the
-        other end of the channel has closed it.  The argument is the
-        client side channel number.  The client will let all buffered
-        data in the channel to drain, and when ready, will close the
-        socket, free the channel, and send the server a
-        SSH_MSG_CHANNEL_CLOSE_CONFIRMATION message for the channel.
-
-   SSH_MSG_CHANNEL_CLOSE_CONFIRMATION
-        This is send by the server to indicate that a channel previously
-        closed by the client has now been closed on the server side as
-        well.  The argument indicates the client channel number.  The
-        client frees the channel.
-
-   The client may send any of the following messages:
-
-   SSH_CMSG_STDIN_DATA
-        This is data to be sent as input to the program running on the
-        server.  The data is passed as a string.
-
-   SSH_CMSG_EOF
-        Indicates that the client has encountered EOF while reading
-
-
-
-Ylonen                                                         [Page 16]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        standard input.  The server will allow any buffered input data
-        to drain, and will then close the input to the program.
-
-   SSH_CMSG_WINDOW_SIZE
-        Indicates that window size on the client has been changed.  The
-        server updates the window size of the tty and causes SIGWINCH to
-        be sent to the program.  The new window size is passed as four
-        integer arguments:  row, col, xpixel, ypixel.
-
-   SSH_MSG_PORT_OPEN
-        Indicates that a connection has been made to a port on the
-        client side for which forwarding has been requested.  Arguments
-        are client side channel number, host name to connect to, and
-        port to connect to.  The server should send back either
-        SSH_MSG_CHANNEL_OPEN_CONFIRMATION or
-        SSH_MSG_CHANNEL_OPEN_FAILURE with the same client side channel
-        number.
-
-   SSH_MSG_CHANNEL_OPEN_CONFIRMATION
-        This is sent by the client to indicate that it has opened a con-
-        nection as requested in a previous message.  The first argument
-        indicates the server side channel number, and the second argu-
-        ment is the channel number that the client has allocated for
-        this connection.
-
-   SSH_MSG_CHANNEL_OPEN_FAILURE
-        This is sent by the client to indicate that it failed to open a
-        connection as requested in a previous message.  The server side
-        channel number is passed as an argument.  The server will close
-        the descriptor associated with the channel and free the channel.
-
-   SSH_MSG_CHANNEL_DATA
-        This packet contains data for a channel from the client.  The
-        first argument is the server side channel number, and the second
-        argument (a string) is the data.
-
-   SSH_MSG_CHANNEL_CLOSE
-        This is sent by the client to indicate that whoever was in the
-        other end of the channel has closed it.  The argument is the
-        server channel number.  The server will allow buffered data to
-        drain, and when ready, will close the socket, free the channel,
-        and send the client a SSH_MSG_CHANNEL_CLOSE_CONFIRMATION message
-        for the channel.
-
-   SSH_MSG_CHANNEL_CLOSE_CONFIRMATION
-        This is send by the client to indicate that a channel previously
-        closed by the server has now been closed on the client side as
-        well.  The argument indicates the server channel number.  The
-
-
-
-Ylonen                                                         [Page 17]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        server frees the channel.
-
-   Any unsupported messages during interactive mode cause the connection
-   to be terminated with SSH_MSG_DISCONNECT and an error message.  Com-
-   patible protocol upgrades should agree about any extensions during
-   the preparation phase or earlier.
-
-
-Termination of the Connection
-
-   Normal termination of the connection is always initiated by the
-   server by sending SSH_SMSG_EXITSTATUS after the program has exited.
-   The client responds to this message by sending
-   SSH_CMSG_EXIT_CONFIRMATION and closes the socket; the server then
-   closes the socket.  There are two purposes for the confirmation: some
-   systems may lose previously sent data when the socket is closed, and
-   closing the client side first causes any TCP/IP TIME_WAIT [RFC0793]
-   waits to occur on the client side, not consuming server resources.
-
-   If the program terminates due to a signal, the server will send
-   SSH_MSG_DISCONNECT with an appropriate message.  If the connection is
-   closed, all file descriptors to the program will be closed and the
-   server will exit.  If the program runs on a tty, the kernel sends it
-   the SIGHUP signal when the pty master side is closed.
-
-Protocol Flags
-
-   Both the server and the client pass 32 bits of protocol flags to the
-   other side.  The flags are intended for compatible protocol exten-
-   sion; the server first announces which added capabilities it sup-
-   ports, and the client then sends the capabilities that it supports.
-
-   The following flags are currently defined (the values are bit masks):
-
-   1 SSH_PROTOFLAG_SCREEN_NUMBER
-        This flag can only be sent by the client.  It indicates that the
-        X11 forwarding requests it sends will include the screen number.
-
-   2 SSH_PROTOFLAG_HOST_IN_FWD_OPEN
-        If both sides specify this flag, SSH_SMSG_X11_OPEN and
-        SSH_MSG_PORT_OPEN messages will contain an additional field con-
-        taining a description of the host at the other end of the con-
-        nection.
-
-Detailed Description of Packet Types and Formats
-
-   The supported packet types and the corresponding message numbers are
-   given in the following table.  Messages with _MSG_ in their name may
-
-
-
-Ylonen                                                         [Page 18]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   be sent by either side.  Messages with _CMSG_ are only sent by the
-   client, and messages with _SMSG_ only by the server.
-
-   A packet may contain additional data after the arguments specified
-   below.  Any such data should be ignored by the receiver.  However, it
-   is recommended that no such data be stored without good reason.
-   (This helps build compatible extensions.)
-
-   0 SSH_MSG_NONE
-        This code is reserved.  This message type is never sent.
-
-   1 SSH_MSG_DISCONNECT
-
-        string   Cause of disconnection
-
-        This message may be sent by either party at any time.  It causes
-        the immediate disconnection of the connection.  The message is
-        intended to be displayed to a human, and describes the reason
-        for disconnection.
-
-   2 SSH_SMSG_PUBLIC_KEY
-
-        8 bytes      anti_spoofing_cookie
-        32-bit int   server_key_bits
-        mp-int       server_key_public_exponent
-        mp-int       server_key_public_modulus
-        32-bit int   host_key_bits
-        mp-int       host_key_public_exponent
-        mp-int       host_key_public_modulus
-        32-bit int   protocol_flags
-        32-bit int   supported_ciphers_mask
-        32-bit int   supported_authentications_mask
-
-        Sent as the first message by the server.  This message gives the
-        server's host key, server key, protocol flags (intended for com-
-        patible protocol extension), supported_ciphers_mask (which is
-        the bitwise or of (1 << cipher_number), where << is the left
-        shift operator, for all supported ciphers), and
-        supported_authentications_mask (which is the bitwise or of (1 <<
-        authentication_type) for all supported authentication types).
-        The anti_spoofing_cookie is 64 random bytes, and must be sent
-        back verbatim by the client in its reply.  It is used to make
-        IP-spoofing more difficult (encryption and host keys are the
-        real defense against spoofing).
-
-   3 SSH_CMSG_SESSION_KEY
-
-        1 byte       cipher_type (must be one of the supported values)
-
-
-
-Ylonen                                                         [Page 19]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        8 bytes      anti_spoofing_cookie (must match data sent by the server)
-        mp-int       double-encrypted session key
-        32-bit int   protocol_flags
-
-        Sent by the client as the first message in the session.  Selects
-        the cipher to use, and sends the encrypted session key to the
-        server.  The anti_spoofing_cookie must be the same bytes that
-        were sent by the server.  Protocol_flags is intended for nego-
-        tiating compatible protocol extensions.
-
-   4 SSH_CMSG_USER
-
-        string   user login name on server
-
-        Sent by the client to begin authentication.  Specifies the user
-        name on the server to log in as.  The server responds with
-        SSH_SMSG_SUCCESS if no authentication is needed for this user,
-        or SSH_SMSG_FAILURE if authentication is needed (or the user
-        does not exist).  [Note to the implementator: the user name is
-        of arbitrary size.  The implementation must be careful not to
-        overflow internal buffers.]
-
-   5 SSH_CMSG_AUTH_RHOSTS
-
-        string   client-side user name
-
-        Requests authentication using /etc/hosts.equiv and .rhosts (or
-        equivalent mechanisms).  This authentication method is normally
-        disabled in the server because it is not secure (but this is the
-        method used by rsh and rlogin).  The server responds with
-        SSH_SMSG_SUCCESS if authentication was successful, and
-        SSH_SMSG_FAILURE if access was not granted.  The server should
-        check that the client side port number is less than 1024 (a
-        privileged port), and immediately reject authentication if it is
-        not.  Supporting this authentication method is optional.  This
-        method should normally not be enabled in the server because it
-        is not safe.  (However, not enabling this only helps if rlogind
-        and rshd are disabled.)
-
-   6 SSH_CMSG_AUTH_RSA
-
-        mp-int   identity_public_modulus
-
-        Requests authentication using pure RSA authentication.  The
-        server checks if the given key is permitted to log in, and if
-        so, responds with SSH_SMSG_AUTH_RSA_CHALLENGE.  Otherwise, it
-        responds with SSH_SMSG_FAILURE.  The client often tries several
-        different keys in sequence until one supported by the server is
-
-
-
-Ylonen                                                         [Page 20]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        found.  Authentication is accepted if the client gives the
-        correct response to the challenge.  The server is free to add
-        other criteria for authentication, such as a requirement that
-        the connection must come from a certain host.  Such additions
-        are not visible at the protocol level.  Supporting this authen-
-        tication method is optional but recommended.
-
-   7 SSH_SMSG_AUTH_RSA_CHALLENGE
-
-        mp-int   encrypted challenge
-
-        Presents an RSA authentication challenge to the client.  The
-        challenge is a 256-bit random value encrypted as described else-
-        where in this document.  The client must decrypt the challenge
-        using the RSA private key, compute MD5 of the challenge plus
-        session id, and send back the resulting 16 bytes using
-        SSH_CMSG_AUTH_RSA_RESPONSE.
-
-   8 SSH_CMSG_AUTH_RSA_RESPONSE
-
-        16 bytes   MD5 of decrypted challenge
-
-        This message is sent by the client in response to an RSA chal-
-        lenge.  The MD5 checksum is returned instead of the decrypted
-        challenge to deter known-plaintext attacks against the RSA key.
-        The server responds to this message with either SSH_SMSG_SUCCESS
-        or SSH_SMSG_FAILURE.
-
-   9 SSH_CMSG_AUTH_PASSWORD
-
-        string   plain text password
-
-        Requests password authentication using the given password.  Note
-        that even though the password is plain text inside the packet,
-        the whole packet is normally encrypted by the packet layer.  It
-        would not be possible for the client to perform password
-        encryption/hashing, because it cannot know which kind of
-        encryption/hashing, if any, the server uses.  The server
-        responds to this message with SSH_SMSG_SUCCESS or
-        SSH_SMSG_FAILURE.
-
-   10 SSH_CMSG_REQUEST_PTY
-
-        string       TERM environment variable value (e.g. vt100)
-        32-bit int   terminal height, rows (e.g., 24)
-        32-bit int   terminal width, columns (e.g., 80)
-        32-bit int   terminal width, pixels (0 if no graphics) (e.g., 480)
-        32-bit int   terminal height, pixels (0 if no graphics) (e.g., 640)
-
-
-
-Ylonen                                                         [Page 21]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        n bytes      tty modes encoded in binary
-
-        Requests a pseudo-terminal to be allocated for this command.
-        This message can be used regardless of whether the session will
-        later execute the shell or a command.  If a pty has been
-        requested with this message, the shell or command will run on a
-        pty.  Otherwise it will communicate with the server using pipes,
-        sockets or some other similar mechanism.
-
-        The terminal type gives the type of the user's terminal.  In the
-        UNIX environment it is passed to the shell or command in the
-        TERM environment variable.
-
-        The width and height values give the initial size of the user's
-        terminal or window.  All values can be zero if not supported by
-        the operating system.  The server will pass these values to the
-        kernel if supported.
-
-        Terminal modes are encoded into a byte stream in a portable for-
-        mat.  The exact format is described later in this document.
-
-        The server responds to the request with either SSH_SMSG_SUCCESS
-        or SSH_SMSG_FAILURE.  If the server does not have the concept of
-        pseudo terminals, it should return success if it is possible to
-        execute a shell or a command so that it looks to the client as
-        if it was running on a pseudo terminal.
-
-   11 SSH_CMSG_WINDOW_SIZE
-
-        32-bit int   terminal height, rows
-        32-bit int   terminal width, columns
-        32-bit int   terminal width, pixels
-        32-bit int   terminal height, pixels
-
-        This message can only be sent by the client during the interac-
-        tive session.  This indicates that the size of the user's window
-        has changed, and provides the new size.  The server will update
-        the kernel's notion of the window size, and a SIGWINCH signal or
-        equivalent will be sent to the shell or command (if supported by
-        the operating system).
-
-   12 SSH_CMSG_EXEC_SHELL
-
-        (no arguments)
-
-        Starts a shell (command interpreter), and enters interactive
-        session mode.
-
-
-
-
-Ylonen                                                         [Page 22]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   13 SSH_CMSG_EXEC_CMD
-
-        string   command to execute
-
-        Starts executing the given command, and enters interactive ses-
-        sion mode.  On UNIX, the command is run as "<shell> -c <com-
-        mand>", where <shell> is the user's login shell.
-
-   14 SSH_SMSG_SUCCESS
-
-        (no arguments)
-
-        This message is sent by the server in response to the session
-        key, a successful authentication request, and a successfully
-        completed preparatory operation.
-
-   15 SSH_SMSG_FAILURE
-
-        (no arguments)
-
-        This message is sent by the server in response to a failed
-        authentication operation to indicate that the user has not yet
-        been successfully authenticated, and in response to a failed
-        preparatory operation.  This is also sent in response to an
-        authentication or preparatory operation request that is not
-        recognized or supported.
-
-   16 SSH_CMSG_STDIN_DATA
-
-        string   data
-
-        Delivers data from the client to be supplied as input to the
-        shell or program running on the server side.  This message can
-        only be used in the interactive session mode.  No acknowledge-
-        ment is sent for this message.
-
-   17 SSH_SMSG_STDOUT_DATA
-
-        string   data
-
-        Delivers data from the server that was read from the standard
-        output of the shell or program running on the server side.  This
-        message can only be used in the interactive session mode.  No
-        acknowledgement is sent for this message.
-
-   18 SSH_SMSG_STDERR_DATA
-
-        string   data
-
-
-
-Ylonen                                                         [Page 23]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        Delivers data from the server that was read from the standard
-        error of the shell or program running on the server side.  This
-        message can only be used in the interactive session mode.  No
-        acknowledgement is sent for this message.
-
-   19 SSH_CMSG_EOF
-
-        (no arguments)
-
-        This message is sent by the client to indicate that EOF has been
-        reached on the input.  Upon receiving this message, and after
-        all buffered input data has been sent to the shell or program,
-        the server will close the input file descriptor to the program.
-        This message can only be used in the interactive session mode.
-        No acknowledgement is sent for this message.
-
-   20 SSH_SMSG_EXITSTATUS
-
-        32-bit int   exit status of the command
-
-        Returns the exit status of the shell or program after it has
-        exited.  The client should respond with
-        SSH_CMSG_EXIT_CONFIRMATION when it has received this message.
-        This will be the last message sent by the server.  If the pro-
-        gram being executed dies with a signal instead of exiting nor-
-        mally, the server should terminate the session with
-        SSH_MSG_DISCONNECT (which can be used to pass a human-readable
-        string indicating that the program died due to a signal) instead
-        of using this message.
-
-   21 SSH_MSG_CHANNEL_OPEN_CONFIRMATION
-
-        32-bit int   remote_channel
-        32-bit int   local_channel
-
-        This is sent in response to any channel open request if the
-        channel has been successfully opened.  Remote_channel is the
-        channel number received in the initial open request;
-        local_channel is the channel number the side sending this mes-
-        sage has allocated for the channel.  Data can be transmitted on
-        the channel after this message.
-
-   22 SSH_MSG_CHANNEL_OPEN_FAILURE
-
-        32-bit int   remote_channel
-
-        This message indicates that an earlier channel open request by
-        the other side has failed or has been denied.  Remote_channel is
-
-
-
-Ylonen                                                         [Page 24]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        the channel number given in the original request.
-
-   23 SSH_MSG_CHANNEL_DATA
-
-        32-bit int   remote_channel
-        string       data
-
-        Data is transmitted in a channel in these messages.  A channel
-        is bidirectional, and both sides can send these messages.  There
-        is no acknowledgement for these messages.  It is possible that
-        either side receives these messages after it has sent
-        SSH_MSG_CHANNEL_CLOSE for the channel.  These messages cannot be
-        received after the party has sent or received
-        SSH_MSG_CHANNEL_CLOSE_CONFIRMATION.
-
-   24 SSH_MSG_CHANNEL_CLOSE
-
-        32-bit int   remote_channel
-
-        When a channel is closed at one end of the connection, that side
-        sends this message.  Upon receiving this message, the channel
-        should be closed.  When this message is received, if the channel
-        is already closed (the receiving side has sent this message for
-        the same channel earlier), the channel is freed and no further
-        action is taken; otherwise the channel is freed and
-        SSH_MSG_CHANNEL_CLOSE_CONFIRMATION is sent in response.  (It is
-        possible that the channel is closed simultaneously at both
-        ends.)
-
-   25 SSH_MSG_CHANNEL_CLOSE_CONFIRMATION
-
-        32-bit int   remote_channel
-
-        This message is sent in response to SSH_MSG_CHANNEL_CLOSE unless
-        the channel was already closed.  When this message is sent or
-        received, the channel is freed.
-
-   26 (OBSOLETED; was unix-domain X11 forwarding)
-
-   27 SSH_SMSG_X11_OPEN
-
-        32-bit int   local_channel
-        string       originator_string (see below)
-
-        This message can be sent by the server during the interactive
-        session mode to indicate that a client has connected the fake X
-        server.  Local_channel is the channel number that the server has
-        allocated for the connection.  The client should try to open a
-
-
-
-Ylonen                                                         [Page 25]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        connection to the real X server, and respond with
-        SSH_MSG_CHANNEL_OPEN_CONFIRMATION or
-        SSH_MSG_CHANNEL_OPEN_FAILURE.
-
-        The field originator_string is present if both sides specified
-        SSH_PROTOFLAG_HOST_IN_FWD_OPEN in the protocol flags.  It con-
-        tains a description of the host originating the connection.
-
-   28 SSH_CMSG_PORT_FORWARD_REQUEST
-
-        32-bit int   server_port
-        string       host_to_connect
-        32-bit int   port_to_connect
-
-        Sent by the client in the preparatory phase, this message
-        requests that server_port on the server machine be forwarded
-        over the secure channel to the client machine, and from there to
-        the specified host and port.  The server should start listening
-        on the port, and send SSH_MSG_PORT_OPEN whenever a connection is
-        made to it.  Supporting this message is optional, and the server
-        is free to reject any forward request.  For example, it is
-        highly recommended that unless the user has been authenticated
-        as root, forwarding any privileged port numbers (below 1024) is
-        denied.
-
-   29 SSH_MSG_PORT_OPEN
-
-        32-bit int   local_channel
-        string       host_name
-        32-bit int   port
-        string       originator_string (see below)
-
-        Sent by either party in interactive session mode, this message
-        indicates that a connection has been opened to a forwarded
-        TCP/IP port.  Local_channel is the channel number that the send-
-        ing party has allocated for the connection.  Host_name is the
-        host the connection should be be forwarded to, and the port is
-        the port on that host to connect.  The receiving party should
-        open the connection, and respond with
-        SSH_MSG_CHANNEL_OPEN_CONFIRMATION or
-        SSH_MSG_CHANNEL_OPEN_FAILURE.  It is recommended that the
-        receiving side check the host_name and port for validity to
-        avoid compromising local security by compromised remote side
-        software.  Particularly, it is recommended that the client per-
-        mit connections only to those ports for which it has requested
-        forwarding with SSH_CMSG_PORT_FORWARD_REQUEST.
-
-        The field originator_string is present if both sides specified
-
-
-
-Ylonen                                                         [Page 26]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        SSH_PROTOFLAG_HOST_IN_FWD_OPEN in the protocol flags.  It con-
-        tains a description of the host originating the connection.
-
-   30 SSH_CMSG_AGENT_REQUEST_FORWARDING
-
-        (no arguments)
-
-        Requests that the connection to the authentication agent be for-
-        warded over the secure channel.  The method used by clients to
-        contact the authentication agent within each machine is imple-
-        mentation and machine dependent.  If the server accepts this
-        request, it should arrange that any clients run from this ses-
-        sion will actually contact the server program when they try to
-        contact the authentication agent.  The server should then send a
-        SSH_SMSG_AGENT_OPEN to open a channel to the agent, and the
-        client should forward the connection to the real authentication
-        agent.  Supporting this message is optional.
-
-   31 SSH_SMSG_AGENT_OPEN
-
-        32-bit int   local_channel
-
-        Sent by the server in interactive session mode, this message
-        requests opening a channel to the authentication agent.  The
-        client should open a channel, and respond with either
-        SSH_MSG_CHANNEL_OPEN_CONFIRMATION or
-        SSH_MSG_CHANNEL_OPEN_FAILURE.
-
-   32 SSH_MSG_IGNORE
-
-        string   data
-
-        Either party may send this message at any time.  This message,
-        and the argument string, is silently ignored.  This message
-        might be used in some implementations to make traffic analysis
-        more difficult.  This message is not currently sent by the
-        implementation, but all implementations are required to recog-
-        nize and ignore it.
-
-   33 SSH_CMSG_EXIT_CONFIRMATION
-
-        (no arguments)
-
-        Sent by the client in response to SSH_SMSG_EXITSTATUS.  This is
-        the last message sent by the client.
-
-   34 SSH_CMSG_X11_REQUEST_FORWARDING
-
-
-
-
-Ylonen                                                         [Page 27]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        string       x11_authentication_protocol
-        string       x11_authentication_data
-        32-bit int   screen number (if SSH_PROTOFLAG_SCREEN_NUMBER)
-
-        Sent by the client during the preparatory phase, this message
-        requests that the server create a fake X11 display and set the
-        DISPLAY environment variable accordingly.  An internet-domain
-        display is preferable.  The given authentication protocol and
-        the associated data should be recorded by the server so that it
-        is used as authentication on connections (e.g., in .Xauthority).
-        The authentication protocol must be one of the supported X11
-        authentication protocols, e.g., "MIT-MAGIC-COOKIE-1".  Authenti-
-        cation data must be a lowercase hex string of even length.  Its
-        interpretation is protocol dependent.  The data is in a format
-        that can be used with e.g. the xauth program.  Supporting this
-        message is optional.
-
-        The client is permitted (and recommended) to generate fake
-        authentication information and send fake information to the
-        server.  This way, a corrupt server will not have access to the
-        user's terminal after the connection has terminated.  The
-        correct authorization codes will also not be left hanging around
-        in files on the server (many users keep the same X session for
-        months, thus protecting the authorization data becomes impor-
-        tant).
-
-        X11 authentication spoofing works by initially sending fake
-        (random) authentication data to the server, and interpreting the
-        first packet sent by the X11 client after the connection has
-        been opened.  The first packet contains the client's authentica-
-        tion.  If the packet contains the correct fake data, it is
-        replaced by the client by the correct authentication data, and
-        then sent to the X server.
-
-   35 SSH_CMSG_AUTH_RHOSTS_RSA
-
-        string       clint-side user name
-        32-bit int   client_host_key_bits
-        mp-int       client_host_key_public_exponent
-        mp-int       client_host_key_public_modulus
-
-        Requests authentication using /etc/hosts.equiv and .rhosts (or
-        equivalent) together with RSA host authentication.  The server
-        should check that the client side port number is less than 1024
-        (a privileged port), and immediately reject authentication if it
-        is not.  The server responds with SSH_SMSG_FAILURE or
-        SSH_SMSG_AUTH_RSA_CHALLENGE.  The client must respond to the
-        challenge with the proper SSH_CMSG_AUTH_RSA_RESPONSE.  The
-
-
-
-Ylonen                                                         [Page 28]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        server then responds with success if access was granted, or
-        failure if the client gave a wrong response.  Supporting this
-        authentication method is optional but recommended in most
-        environments.
-
-   36 SSH_MSG_DEBUG
-
-        string   debugging message sent to the other side
-
-        This message may be sent by either party at any time.  It is
-        used to send debugging messages that may be informative to the
-        user in solving various problems.  For example, if authentica-
-        tion fails because of some configuration error (e.g., incorrect
-        permissions for some file), it can be very helpful for the user
-        to make the cause of failure available.  On the other hand, one
-        should not make too much information available for security rea-
-        sons.  It is recommended that the client provides an option to
-        display the debugging information sent by the sender (the user
-        probably does not want to see it by default).  The server can
-        log debugging data sent by the client (if any).  Either party is
-        free to ignore any received debugging data.  Every implementa-
-        tion must be able to receive this message, but no implementation
-        is required to send these.
-
-   37 SSH_CMSG_REQUEST_COMPRESSION
-
-        32-bit int   gzip compression level (1-9)
-
-        This message can be sent by the client in the preparatory opera-
-        tions phase.  The server responds with SSH_SMSG_FAILURE if it
-        does not support compression or does not want to compress; it
-        responds with SSH_SMSG_SUCCESS if it accepted the compression
-        request.  In the latter case the response to this packet will
-        still be uncompressed, but all further packets in either direc-
-        tion will be compressed by gzip.
-
-
-Encoding of Terminal Modes
-
-   Terminal modes (as passed in SSH_CMSG_REQUEST_PTY) are encoded into a
-   byte stream.  It is intended that the coding be portable across dif-
-   ferent environments.
-
-   The tty mode description is a stream of bytes.  The stream consists
-   of opcode-argument pairs.  It is terminated by opcode TTY_OP_END (0).
-   Opcodes 1-127 have one-byte arguments.  Opcodes 128-159 have 32-bit
-   integer arguments (stored msb first).  Opcodes 160-255 are not yet
-   defined, and cause parsing to stop (they should only be used after
-
-
-
-Ylonen                                                         [Page 29]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   any other data).
-
-   The client puts in the stream any modes it knows about, and the
-   server ignores any modes it does not know about.  This allows some
-   degree of machine-independence, at least between systems that use a
-   POSIX-like [POSIX] tty interface.  The protocol can support other
-   systems as well, but the client may need to fill reasonable values
-   for a number of parameters so the server pty gets set to a reasonable
-   mode (the server leaves all unspecified mode bits in their default
-   values, and only some combinations make sense).
-
-   The following opcodes have been defined.  The naming of opcodes
-   mostly follows the POSIX terminal mode flags.
-
-   0 TTY_OP_END
-        Indicates end of options.
-
-   1 VINTR
-        Interrupt character; 255 if none.  Similarly for the other char-
-        acters.  Not all of these characters are supported on all sys-
-        tems.
-
-   2 VQUIT
-        The quit character (sends SIGQUIT signal on UNIX systems).
-
-   3 VERASE
-        Erase the character to left of the cursor.
-
-   4 VKILL
-        Kill the current input line.
-
-   5 VEOF
-        End-of-file character (sends EOF from the terminal).
-
-   6 VEOL
-        End-of-line character in addition to carriage return and/or
-        linefeed.
-
-   7 VEOL2
-        Additional end-of-line character.
-
-   8 VSTART
-        Continues paused output (normally ^Q).
-
-   9 VSTOP
-        Pauses output (^S).
-
-   10 VSUSP
-
-
-
-Ylonen                                                         [Page 30]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        Suspends the current program.
-
-   11 VDSUSP
-        Another suspend character.
-
-   12 VREPRINT
-        Reprints the current input line.
-
-   13 VWERASE
-        Erases a word left of cursor.
-
-   14 VLNEXT
-        More special input characters; these are probably not supported
-        on most systems.
-
-   15 VFLUSH
-
-   16 VSWTCH
-
-   17 VSTATUS
-
-   18 VDISCARD
-
-
-   30 IGNPAR
-        The ignore parity flag.  The next byte should be 0 if this flag
-        is not set, and 1 if it is set.
-
-   31 PARMRK
-        More flags.  The exact definitions can be found in the POSIX
-        standard.
-
-   32 INPCK
-
-   33 ISTRIP
-
-   34 INLCR
-
-   35 IGNCR
-
-   36 ICRNL
-
-   37 IUCLC
-
-   38 IXON
-
-   39 IXANY
-
-
-
-
-Ylonen                                                         [Page 31]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   40 IXOFF
-
-   41 IMAXBEL
-
-
-   50 ISIG
-
-   51 ICANON
-
-   52 XCASE
-
-   53 ECHO
-
-   54 ECHOE
-
-   55 ECHOK
-
-   56 ECHONL
-
-   57 NOFLSH
-
-   58 TOSTOP
-
-   59 IEXTEN
-
-   60 ECHOCTL
-
-   61 ECHOKE
-
-   62 PENDIN
-
-
-   70 OPOST
-
-   71 OLCUC
-
-   72 ONLCR
-
-   73 OCRNL
-
-   74 ONOCR
-
-   75 ONLRET
-
-
-   90 CS7
-
-   91 CS8
-
-
-
-Ylonen                                                         [Page 32]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   92 PARENB
-
-   93 PARODD
-
-
-   192 TTY_OP_ISPEED
-        Specifies the input baud rate in bits per second.
-
-   193 TTY_OP_OSPEED
-        Specifies the output baud rate in bits per second.
-
-
-The Authentication Agent Protocol
-
-   The authentication agent is a program that can be used to hold RSA
-   authentication keys for the user (in future, it might hold data for
-   other authentication types as well).  An authorized program can send
-   requests to the agent to generate a proper response to an RSA chal-
-   lenge.  How the connection is made to the agent (or its representa-
-   tive) inside a host and how access control is done inside a host is
-   implementation-dependent; however, how it is forwarded and how one
-   interacts with it is specified in this protocol.  The connection to
-   the agent is normally automatically forwarded over the secure chan-
-   nel.
-
-   A program that wishes to use the agent first opens a connection to
-   its local representative (typically, the agent itself or an SSH
-   server).  It then writes a request to the connection, and waits for
-   response.  It is recommended that at least five minutes of timeout
-   are provided waiting for the agent to respond to an authentication
-   challenge (this gives sufficient time for the user to cut-and-paste
-   the challenge to a separate machine, perform the computation there,
-   and cut-and-paste the result back if so desired).
-
-   Messages sent to and by the agent are in the following format:
-
-   4 bytes     Length, msb first.  Does not include length itself.
-   1 byte      Packet type.  The value 255 is reserved for future extensions.
-   data        Any data, depending on packet type.  Encoding as in the ssh packet
-   protocol.
-
-
-   The following message types are currently defined:
-
-   1 SSH_AGENTC_REQUEST_RSA_IDENTITIES
-
-        (no arguments)
-
-
-
-
-Ylonen                                                         [Page 33]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        Requests the agent to send a list of all RSA keys for which it
-        can answer a challenge.
-
-   2 SSH_AGENT_RSA_IDENTITIES_ANSWER
-
-        32-bit int       howmany
-        howmany times:
-        32-bit int       bits
-        mp-int           public exponent
-        mp-int           public modulus
-        string           comment
-
-        The agent sends this message in response to the to
-        SSH_AGENTC_REQUEST_RSA_IDENTITIES.  The answer lists all RSA
-        keys for which the agent can answer a challenge.  The comment
-        field is intended to help identify each key; it may be printed
-        by an application to indicate which key is being used.  If the
-        agent is not holding any keys, howmany will be zero.
-
-   3 SSH_AGENTC_RSA_CHALLENGE
-
-        32-bit int   bits
-        mp-int       public exponent
-        mp-int       public modulus
-        mp-int       challenge
-        16 bytes     session_id
-        32-bit int   response_type
-
-        Requests RSA decryption of random challenge to authenticate the
-        other side.  The challenge will be decrypted with the RSA
-        private key corresponding to the given public key.
-
-        The decrypted challenge must contain a zero in the highest (par-
-        tial) byte, 2 in the next byte, followed by non-zero random
-        bytes, a zero byte, and then the real challenge value in the
-        lowermost bytes.  The real challenge must be 32 8-bit bytes (256
-        bits).
-
-        Response_type indicates the format of the response to be
-        returned.  Currently the only supported value is 1, which means
-        to compute MD5 of the real challenge plus session id, and return
-        the resulting 16 bytes in a SSH_AGENT_RSA_RESPONSE message.
-
-   4 SSH_AGENT_RSA_RESPONSE
-
-        16 bytes   MD5 of decrypted challenge
-
-        Answers an RSA authentication challenge.  The response is 16
-
-
-
-Ylonen                                                         [Page 34]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        bytes:  the MD5 checksum of the 32-byte challenge.
-
-   5 SSH_AGENT_FAILURE
-
-        (no arguments)
-
-        This message is sent whenever the agent fails to answer a
-        request properly.  For example, if the agent cannot answer a
-        challenge (e.g., no longer has the proper key), it can respond
-        with this.  The agent also responds with this message if it
-        receives a message it does not recognize.
-
-   6 SSH_AGENT_SUCCESS
-
-        (no arguments)
-
-        This message is sent by the agent as a response to certain
-        requests that do not otherwise cause a message be sent.
-        Currently, this is only sent in response to
-        SSH_AGENTC_ADD_RSA_IDENTITY and SSH_AGENTC_REMOVE_RSA_IDENTITY.
-
-   7 SSH_AGENTC_ADD_RSA_IDENTITY
-
-        32-bit int   bits
-        mp-int       public modulus
-        mp-int       public exponent
-        mp-int       private exponent
-        mp-int       multiplicative inverse of p mod q
-        mp-int       p
-        mp-int       q
-        string       comment
-
-        Registers an RSA key with the agent.  After this request, the
-        agent can use this RSA key to answer requests.  The agent
-        responds with SSH_AGENT_SUCCESS or SSH_AGENT_FAILURE.
-
-   8 SSH_AGENT_REMOVE_RSA_IDENTITY
-
-        32-bit int   bits
-        mp-int       public exponent
-        mp-int       public modulus
-
-        Removes an RSA key from the agent.  The agent will no longer
-        accept challenges for this key and will not list it as a sup-
-        ported identity.  The agent responds with SSH_AGENT_SUCCESS or
-        SSH_AGENT_FAILURE.
-
-   If the agent receives a message that it does not understand, it
-
-
-
-Ylonen                                                         [Page 35]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   responds with SSH_AGENT_FAILURE.  This permits compatible future
-   extensions.
-
-   It is possible that several clients have a connection open to the
-   authentication agent simultaneously.  Each client will use a separate
-   connection (thus, any SSH connection can have multiple agent connec-
-   tions active simultaneously).
-
-
-References
-
-
-   [DES] FIPS PUB 46-1: Data Encryption Standard.  National Bureau of
-        Standards, January 1988.  FIPS PUB 81: DES Modes of Operation.
-        National Bureau of Standards, December 1980.  Bruce Schneier:
-        Applied Cryptography.  John Wiley & Sons, 1994.  J. Seberry and
-        J. Pieprzyk:  Cryptography: An Introduction to Computer Secu-
-        rity.  Prentice-Hall, 1989.
-
-   [GZIP]
-        The GNU GZIP program; available for anonymous ftp at
-        prep.ai.mit.edu.  Please let me know if you know a paper
-        describing the algorithm.
-
-   [IDEA]
-        Xuejia Lai: On the Design and Security of Block Ciphers, ETH
-        Series in Information Processing, vol. 1, Hartung-Gorre Verlag,
-        Konstanz, Switzerland, 1992.  Bruce Schneier: Applied Cryptogra-
-        phy, John Wiley & Sons, 1994.  See also the following patents:
-        PCT/CH91/00117, EP 0 482 154 B1, US Pat. 5,214,703.
-
-   [PKCS#1]
-        PKCS #1: RSA Encryption Standard.  Version 1.5, RSA Labora-
-        tories, November 1993.  Available for anonymous ftp at
-        ftp.rsa.com.
-
-   [POSIX]
-        Portable Operating System Interface (POSIX) - Part 1: Applica-
-        tion Program Interface (API) [C language], ISO/IEC 9945-1, IEEE
-        Std 1003.1, 1990.
-
-   [RFC0791]
-        J. Postel: Internet Protocol, RFC 791, USC/ISI, September 1981.
-
-   [RFC0793]
-        J. Postel: Transmission Control Protocol, RFC 793, USC/ISI, Sep-
-        tember 1981.
-
-
-
-
-Ylonen                                                         [Page 36]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   [RFC1034]
-        P. Mockapetris: Domain Names - Concepts and Facilities, RFC
-        1034, USC/ISI, November 1987.
-
-   [RFC1282]
-        B. Kantor: BSD Rlogin, RFC 1258, UCSD, December 1991.
-
-   [RSA] Bruce Schneier: Applied Cryptography.  John Wiley & Sons, 1994.
-        See also R. Rivest, A. Shamir, and L. M. Adleman: Cryptographic
-        Communications System and Method.  US Patent 4,405,829, 1983.
-
-   [X11] R. Scheifler: X Window System Protocol, X Consortium Standard,
-        Version 11, Release 6.  Massachusetts Institute of Technology,
-        Laboratory of Computer Science, 1994.
-
-
-Security Considerations
-
-   This protocol deals with the very issue of user authentication and
-   security.
-
-   First of all, as an implementation issue, the server program will
-   have to run as root (or equivalent) on the server machine.  This is
-   because the server program will need be able to change to an arbi-
-   trary user id.  The server must also be able to create a privileged
-   TCP/IP port.
-
-   The client program will need to run as root if any variant of .rhosts
-   authentication is to be used.  This is because the client program
-   will need to create a privileged port.  The client host key is also
-   usually stored in a file which is readable by root only.  The client
-   needs the host key in .rhosts authentication only.  Root privileges
-   can be dropped as soon as the privileged port has been created and
-   the host key has been read.
-
-   The SSH protocol offers major security advantages over existing tel-
-   net and rlogin protocols.
-
-   o    IP spoofing is restricted to closing a connection (by encryp-
-        tion, host keys, and the special random cookie).  If encryption
-        is not used, IP spoofing is possible for those who can hear
-        packets going out from the server.
-
-   o    DNS spoofing is made ineffective (by host keys).
-
-   o    Routing spoofing is made ineffective (by host keys).
-
-   o    All data is encrypted with strong algorithms to make
-
-
-
-Ylonen                                                         [Page 37]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-        eavesdropping as difficult as possible.  This includes encrypt-
-        ing any authentication information such as passwords.  The
-        information for decrypting session keys is destroyed every hour.
-
-   o    Strong authentication methods: .rhosts combined with RSA host
-        authentication, and pure RSA authentication.
-
-   o    X11 connections and arbitrary TCP/IP ports can be forwarded
-        securely.
-
-   o    Man-in-the-middle attacks are deterred by using the server host
-        key to encrypt the session key.
-
-   o    Trojan horses to catch a password by routing manipulation are
-        deterred by checking that the host key of the server machine
-        matches that stored on the client host.
-
-   The security of SSH against man-in-the-middle attacks and the secu-
-   rity of the new form of .rhosts authentication, as well as server
-   host validation, depends on the integrity of the host key and the
-   files containing known host keys.
-
-   The host key is normally stored in a root-readable file.  If the host
-   key is compromised, it permits attackers to use IP, DNS and routing
-   spoofing as with current rlogin and rsh.  It should never be any
-   worse than the current situation.
-
-   The files containing known host keys are not sensitive.  However, if
-   an attacker gets to modify the known host key files, it has the same
-   consequences as a compromised host key, because the attacker can then
-   change the recorded host key.
-
-   The security improvements obtained by this protocol for X11 are of
-   particular significance.  Previously, there has been no way to pro-
-   tect data communicated between an X server and a client running on a
-   remote machine.  By creating a fake display on the server, and for-
-   warding all X11 requests over the secure channel, SSH can be used to
-   run any X11 applications securely without any cooperation with the
-   vendors of the X server or the application.
-
-   Finally, the security of this program relies on the strength of the
-   underlying cryptographic algorithms.  The RSA algorithm is used for
-   authentication key exchange.  It is widely believed to be secure.  Of
-   the algorithms used to encrypt the session, DES has a rather small
-   key these days, probably permitting governments and organized crimi-
-   nals to break it in very short time with specialized hardware.  3DES
-   is probably safe (but slower).  IDEA is widely believed to be secure.
-   People have varying degrees of confidence in the other algorithms.
-
-
-
-Ylonen                                                         [Page 38]
-
-Internet-Draft  SSH (Secure Shell) Remote Login Protocol     15 Nov 1995
-
-
-   This program is not secure if used with no encryption at all.
-
-
-Additional Information
-
-   Additional information (especially on the implementation and mailing
-   lists) is available via WWW at http://www.cs.hut.fi/ssh.
-
-   Comments should be sent to Tatu Ylonen <ylo@cs.hut.fi> or the SSH
-   Mailing List <ssh@clinet.fi>.
-
-Author's Address
-
-
-   Tatu Ylonen
-   Helsinki University of Technology
-   Otakaari 1
-   FIN-02150 Espoo, Finland
-
-   Phone: +358-0-451-3374
-   Fax: +358-0-451-3293
-   EMail: ylo@cs.hut.fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Ylonen                                                         [Page 39]
-
diff --git a/usr.bin/ssh/config.cache b/usr.bin/ssh/config.cache
deleted file mode 100644
index 3e1490d3a6b..00000000000
--- a/usr.bin/ssh/config.cache
+++ /dev/null
@@ -1,102 +0,0 @@
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
-ac_cv_c_const=${ac_cv_c_const=yes}
-ac_cv_c_inline=${ac_cv_c_inline=inline}
-ac_cv_func__getpty=${ac_cv_func__getpty=no}
-ac_cv_func_clock=${ac_cv_func_clock=yes}
-ac_cv_func_fchmod=${ac_cv_func_fchmod=yes}
-ac_cv_func_getdtablesize=${ac_cv_func_getdtablesize=yes}
-ac_cv_func_gethostname=${ac_cv_func_gethostname=yes}
-ac_cv_func_getrusage=${ac_cv_func_getrusage=yes}
-ac_cv_func_gettimeofday=${ac_cv_func_gettimeofday=yes}
-ac_cv_func_initgroups=${ac_cv_func_initgroups=yes}
-ac_cv_func_innetgr=${ac_cv_func_innetgr=yes}
-ac_cv_func_memcpy=${ac_cv_func_memcpy=yes}
-ac_cv_func_memmove=${ac_cv_func_memmove=yes}
-ac_cv_func_openpty=${ac_cv_func_openpty=no}
-ac_cv_func_popen=${ac_cv_func_popen=yes}
-ac_cv_func_putenv=${ac_cv_func_putenv=yes}
-ac_cv_func_random=${ac_cv_func_random=yes}
-ac_cv_func_remove=${ac_cv_func_remove=yes}
-ac_cv_func_seteuid=${ac_cv_func_seteuid=yes}
-ac_cv_func_setlogin=${ac_cv_func_setlogin=yes}
-ac_cv_func_setluid=${ac_cv_func_setluid=no}
-ac_cv_func_setrlimit=${ac_cv_func_setrlimit=yes}
-ac_cv_func_setsid=${ac_cv_func_setsid=yes}
-ac_cv_func_socketpair=${ac_cv_func_socketpair=yes}
-ac_cv_func_strchr=${ac_cv_func_strchr=yes}
-ac_cv_func_strerror=${ac_cv_func_strerror=yes}
-ac_cv_func_times=${ac_cv_func_times=yes}
-ac_cv_func_ulimit=${ac_cv_func_ulimit=no}
-ac_cv_func_umask=${ac_cv_func_umask=yes}
-ac_cv_func_vhangup=${ac_cv_func_vhangup=no}
-ac_cv_func_vsnprintf=${ac_cv_func_vsnprintf=yes}
-ac_cv_header_dirent_dirent_h=${ac_cv_header_dirent_dirent_h=yes}
-ac_cv_header_gmp_h=${ac_cv_header_gmp_h=yes}
-ac_cv_header_krb_h=${ac_cv_header_krb_h=no}
-ac_cv_header_lastlog_h=${ac_cv_header_lastlog_h=no}
-ac_cv_header_netinet_in_systm_h=${ac_cv_header_netinet_in_systm_h=yes}
-ac_cv_header_paths_h=${ac_cv_header_paths_h=yes}
-ac_cv_header_rusage_h=${ac_cv_header_rusage_h=no}
-ac_cv_header_sgtty_h=${ac_cv_header_sgtty_h=yes}
-ac_cv_header_stat_broken=${ac_cv_header_stat_broken=no}
-ac_cv_header_stdc=${ac_cv_header_stdc=yes}
-ac_cv_header_sys_filio_h=${ac_cv_header_sys_filio_h=yes}
-ac_cv_header_sys_ioctl_h=${ac_cv_header_sys_ioctl_h=yes}
-ac_cv_header_sys_select_h=${ac_cv_header_sys_select_h=yes}
-ac_cv_header_sys_time_h=${ac_cv_header_sys_time_h=yes}
-ac_cv_header_sys_wait_h=${ac_cv_header_sys_wait_h=yes}
-ac_cv_header_termios_h=${ac_cv_header_termios_h=yes}
-ac_cv_header_time=${ac_cv_header_time=yes}
-ac_cv_header_ulimit_h=${ac_cv_header_ulimit_h=no}
-ac_cv_header_unistd_h=${ac_cv_header_unistd_h=yes}
-ac_cv_header_usersec_h=${ac_cv_header_usersec_h=no}
-ac_cv_header_utime_h=${ac_cv_header_utime_h=yes}
-ac_cv_header_utmp_h=${ac_cv_header_utmp_h=yes}
-ac_cv_header_utmpx_h=${ac_cv_header_utmpx_h=no}
-ac_cv_header_zlib_h=${ac_cv_header_zlib_h=yes}
-ac_cv_lib_c_crypt=${ac_cv_lib_c_crypt=yes}
-ac_cv_lib_des_main=${ac_cv_lib_des_main=yes}
-ac_cv_lib_dir_opendir=${ac_cv_lib_dir_opendir=no}
-ac_cv_lib_gmp_main=${ac_cv_lib_gmp_main=yes}
-ac_cv_lib_krb_main=${ac_cv_lib_krb_main=yes}
-ac_cv_lib_nsl_main=${ac_cv_lib_nsl_main=no}
-ac_cv_lib_socket_socket=${ac_cv_lib_socket_socket=no}
-ac_cv_lib_sun_getpwnam=${ac_cv_lib_sun_getpwnam=no}
-ac_cv_lib_util_login=${ac_cv_lib_util_login=yes}
-ac_cv_lib_z_main=${ac_cv_lib_z_main=yes}
-ac_cv_path_RSH_PATH=${ac_cv_path_RSH_PATH=/usr/bin/rsh}
-ac_cv_path_WISH=${ac_cv_path_WISH=/usr/bin/true}
-ac_cv_path_XAUTH_PATH=${ac_cv_path_XAUTH_PATH=/usr/X11R6/bin/xauth}
-ac_cv_path_install=${ac_cv_path_install='/usr/bin/install -c'}
-ac_cv_prog_CC=${ac_cv_prog_CC=gcc}
-ac_cv_prog_CPP=${ac_cv_prog_CPP='gcc -E'}
-ac_cv_prog_LN_S=${ac_cv_prog_LN_S='ln -s'}
-ac_cv_prog_MAKEDEP=${ac_cv_prog_MAKEDEP=makedepend}
-ac_cv_prog_RANLIB=${ac_cv_prog_RANLIB=ranlib}
-ac_cv_prog_cc_cross=${ac_cv_prog_cc_cross=no}
-ac_cv_prog_cc_g=${ac_cv_prog_cc_g=yes}
-ac_cv_prog_cc_works=${ac_cv_prog_cc_works=yes}
-ac_cv_prog_gcc=${ac_cv_prog_gcc=yes}
-ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
-ac_cv_sizeof_long=${ac_cv_sizeof_long=4}
-ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
-ac_cv_struct_st_blksize=${ac_cv_struct_st_blksize=yes}
-ac_cv_type_mode_t=${ac_cv_type_mode_t=yes}
-ac_cv_type_off_t=${ac_cv_type_off_t=yes}
-ac_cv_type_signal=${ac_cv_type_signal=void}
-ac_cv_type_size_t=${ac_cv_type_size_t=yes}
-ac_cv_type_uid_t=${ac_cv_type_uid_t=yes}
diff --git a/usr.bin/ssh/config.guess b/usr.bin/ssh/config.guess
deleted file mode 100644
index 72f934d4003..00000000000
--- a/usr.bin/ssh/config.guess
+++ /dev/null
@@ -1,1012 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 1999 Free Software Foundation, Inc.
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >dummy.s
-	.globl main
-	.ent main
-main:
-	.frame \$30,0,\$26,0
-	.prologue 0
-	.long 0x47e03d80 # implver $0
-	lda \$2,259
-	.long 0x47e20c21 # amask $2,$1
-	srl \$1,8,\$2
-	sll \$2,2,\$2
-	sll \$0,3,\$0
-	addl \$1,\$0,\$0
-	addl \$2,\$0,\$0
-	ret \$31,(\$26),1
-	.end main
-EOF
-	${CC-cc} dummy.s -o dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		./dummy
-		case "$?" in
-			7)
-				UNAME_MACHINE="alpha"
-				;;
-			15)
-				UNAME_MACHINE="alphaev5"
-				;;
-			14)
-				UNAME_MACHINE="alphaev56"
-				;;
-			10)
-				UNAME_MACHINE="alphapca56"
-				;;
-			16)
-				UNAME_MACHINE="alphaev6"
-				;;
-		esac
-	fi
-	rm -f dummy.s dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-        # How do we know it's Interix rather than generic posix subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname 
-	# instead of the specific alpha model.
-	echo alpha-pc-interix
-	exit 0;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-cbm-sysv4
-	exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    arm32:NetBSD:*:*)
-	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    SR2?01:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:NetBSD:*:*)
-	echo m68k-atari-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3*:NetBSD:*:*)
-	echo m68k-sun-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:NetBSD:*:*)
-	echo m68k-apple-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	sed 's/^	//' << EOF >dummy.c
-	int main (argc, argv) int argc; char **argv; {
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	${CC-cc} dummy.c -o dummy \
-	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	fi
-        else echo i586-dg-dgux${UNAME_RELEASE}
-        fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		sed 's/^		//' << EOF >dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-		rm -f dummy.c dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:4)
-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=4.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    *9??*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9] )
-
-              sed 's/^              //' << EOF >dummy.c
-              #include <stdlib.h>
-              #include <unistd.h>
-              
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif 
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-              
-                  switch (cpu) 
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0: 
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits) 
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif 
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-	(${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
-	rm -f dummy.c dummy
-	esac
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i?86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE}
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE}
-	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
-    F300:UNIX_System_V:*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    F301:UNIX_System_V:*:*)
-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-       exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-	echo m68k-hp-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-        if test -x /usr/bin/objformat -a "elf" = "`/usr/bin/objformat`"; then
-          echo ${UNAME_MACHINE}-unknown-freebsdelf
-        else
-	  echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
-      fi
-	exit 0 ;;
-    *:NetBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin32
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-        # How do we know it's Interix rather than generic posix subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# change UNAME_MACHINE based on the output of uname instead of
-	# i386?
-	echo i386-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin32
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    *:Linux:*:*)
-	# uname on the ARM produces all sorts of strangeness, and we need to
-	# filter it out.
-	case "$UNAME_MACHINE" in
-	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
-	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
-	esac
-
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us.
-	ld_help_string=`ld --help 2>&1`
-	ld_supported_emulations=`echo $ld_help_string \
-			 | sed -ne '/supported emulations:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported emulations: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_emulations" in
-	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
-	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
-	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  elf32ppc | elf32ppclinux)
-		# Determine Lib Version
-		cat >dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#if defined(__GLIBC__)
-  printf("%s %s\n", __libc_version, __libc_release);
-#else
-  printf("unkown\n");
-#endif
-  return 0;
-}
-EOF
-		LIBC=""
-		${CC-cc} dummy.c -o dummy 2>/dev/null
-		if test "$?" = 0 ; then
-			./dummy | grep 1\.99 > /dev/null
-			if test "$?" = 0 ; then
-				LIBC="libc1"
-			fi
-		fi	
-		rm -f dummy.c dummy
-		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
-	esac
-
-	if test "${UNAME_MACHINE}" = "alpha" ; then
-		sed 's/^	//'  <<EOF >dummy.s
-		.globl main
-		.ent main
-	main:
-		.frame \$30,0,\$26,0
-		.prologue 0
-		.long 0x47e03d80 # implver $0
-		lda \$2,259
-		.long 0x47e20c21 # amask $2,$1
-		srl \$1,8,\$2
-		sll \$2,2,\$2
-		sll \$0,3,\$0
-		addl \$1,\$0,\$0
-		addl \$2,\$0,\$0
-		ret \$31,(\$26),1
-		.end main
-EOF
-		LIBC=""
-		${CC-cc} dummy.s -o dummy 2>/dev/null
-		if test "$?" = 0 ; then
-			./dummy
-			case "$?" in
-			7)
-				UNAME_MACHINE="alpha"
-				;;
-			15)
-				UNAME_MACHINE="alphaev5"
-				;;
-			14)
-				UNAME_MACHINE="alphaev56"
-				;;
-			10)
-				UNAME_MACHINE="alphapca56"
-				;;
-			16)
-				UNAME_MACHINE="alphaev6"
-				;;
-			esac	
-
-			objdump --private-headers dummy | \
-			  grep ld.so.1 > /dev/null
-			if test "$?" = 0 ; then
-				LIBC="libc1"
-			fi
-		fi	
-		rm -f dummy.s dummy
-		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
-	elif test "${UNAME_MACHINE}" = "mips" ; then
-	  cat >dummy.c <<EOF
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#ifdef __MIPSEB__
-  printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
-	else
-	  # Either a pre-BFD a.out linker (linux-gnuoldld)
-	  # or one that does not give us useful --help.
-	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	  # If ld does not provide *any* "supported emulations:"
-	  # that means it is gnuoldld.
-	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
-	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
-
-	  case "${UNAME_MACHINE}" in
-	  i?86)
-	    VENDOR=pc;
-	    ;;
-	  *)
-	    VENDOR=unknown;
-	    ;;
-	  esac
-	  # Determine whether the default compiler is a.out or elf
-	  cat >dummy.c <<EOF
-#include <features.h>
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
-	fi ;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
-# are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i?86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-	fi
-	exit 0 ;;
-    i?86:*:5:7*)
-       UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-       (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-       (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-               && UNAME_MACHINE=i586
-# 5.0.4c returns "Pent II".  5.0.5 returns PentII
-       (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) \
-               && UNAME_MACHINE=i686
-       (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-               && UNAME_MACHINE=i686
-       echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
-       exit 0 ;;
-    i?86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*PentII' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pent II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-                (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-                        && UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    pc:*:*:*)
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i?86:LynxOS:2.*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:*:6*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-cat >dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-#if !defined (ultrix)
-  printf ("vax-dec-bsd\n"); exit (0);
-#else
-  printf ("vax-dec-ultrix\n"); exit (0);
-#endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-#echo '(Unable to guess system type)' 1>&2
-
-exit 1
diff --git a/usr.bin/ssh/config.h.in b/usr.bin/ssh/config.h.in
deleted file mode 100644
index 215a96e7cd9..00000000000
--- a/usr.bin/ssh/config.h.in
+++ /dev/null
@@ -1,442 +0,0 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-/*
-
-acconfig.h - template used by autoheader to create config.h.in
-config.h.in - used by autoconf to create config.h
-config.h - created by autoconf; contains defines generated by autoconf
-
-Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>
-
-*/
-
-#define RCSID(msg) \
-static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
-
-
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef gid_t
-
-/* Define if your struct stat has st_blksize.  */
-#undef HAVE_ST_BLKSIZE
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-#undef HAVE_SYS_WAIT_H
-
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef mode_t
-
-/* Define if your C compiler doesn't accept -c and -o together.  */
-#undef NO_MINUS_C_MINUS_O
-
-/* Define if your Fortran 77 compiler doesn't accept -c and -o together. */
-#undef F77_NO_MINUS_C_MINUS_O
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
-
-/* Define as the return type of signal handlers (int or void).  */
-#undef RETSIGTYPE
-
-/* Define to the type of arg1 for select(). */
-#undef SELECT_TYPE_ARG1
-
-/* Define to the type of args 2, 3 and 4 for select(). */
-#undef SELECT_TYPE_ARG234
-
-/* Define to the type of arg5 for select(). */
-#undef SELECT_TYPE_ARG5
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
-
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
-#undef STAT_MACROS_BROKEN
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#undef TIME_WITH_SYS_TIME
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef uid_t
-
-/* Define if your processor stores words with the most significant
-   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-#undef WORDS_BIGENDIAN
-
-/* Define if you have SYSV-style /dev/ptmx and /dev/pts/. */
-#undef HAVE_DEV_PTMX
-
-/* Define if you have /dev/pts and /dev/ptc devices (as in AIX). */
-#undef HAVE_DEV_PTS_AND_PTC
-
-/* Define if you have shadow passwords in /etc/security/passwd (AIX style). */
-#undef HAVE_ETC_SECURITY_PASSWD
-
-/* Define if you have shadow passwords in /etc/security/passwd.adjunct
-   (SunOS style). */
-#undef HAVE_ETC_SECURITY_PASSWD_ADJUNCT
-
-  
-/* Define if you have OSF1 C2 security installed on the system */
-#undef HAVE_OSF1_C2_SECURITY
-
-/* Define if you have shadow passwords in /etc/shadow (Solaris style). */
-#undef HAVE_ETC_SHADOW
-
-/* Define if you have system login defaults in /etc/default/login. */
-#undef HAVE_ETC_DEFAULT_LOGIN
-
-/* Define if utmp structure has host field. */
-#undef HAVE_HOST_IN_UTMP
-
-/* Define if utmp structure has addr field. */
-#undef HAVE_ADDR_IN_UTMP
-
-/* Define if utmp structure has id field. */
-#undef HAVE_ID_IN_UTMP
-
-/* Define if utmp structure has name field. */
-#undef HAVE_NAME_IN_UTMP
-
-/* Define if utmp structure has pid field. */
-#undef HAVE_PID_IN_UTMP
-
-/* Define if utmpx structure has ut_session. */
-#undef HAVE_UT_SESSION
-
-/* Define if utmpx structure has ut_syslen. */
-#undef HAVE_UT_SYSLEN
-
-/* Define if /var/adm/lastlog or whatever it is called is a directory
-   (e.g. SGI IRIX). */
-#undef LASTLOG_IS_DIR
-
-/* Define to use RSAREF. */
-#undef RSAREF
-
-/* Define to use SSL. */
-#undef DO_SSL
-
-/* Define this to be the path of the rsh program to support executing rsh. */
-#undef RSH_PATH
-
-/* Define this to be the path of the xauth program. */
-#undef XAUTH_PATH
-
-/* Default path for utmp.  Determined by configure. */
-#undef SSH_UTMP
-
-/* Default path for wtmp.  Determined by configure. */
-#undef SSH_WTMP
-
-/* Default path for lastlog.  Determined by configure. */
-#undef SSH_LASTLOG
-
-/* This is defined if we found a lastlog file.  The presence of lastlog.h
-   alone is not a sufficient indicator (at least newer BSD systems have
-   lastlog but no lastlog.h. */
-#undef HAVE_LASTLOG
-
-/* Define this if libutil.a contains BSD 4.4 compatible login(), logout(),
-   and logwtmp() calls. */
-#undef HAVE_LIBUTIL_LOGIN
-
-/* Location of system mail spool directory. */
-#undef MAIL_SPOOL_DIRECTORY
-
-/* Defined if mail goes to $HOME/newmail instead of a global mail spool. */
-#undef HAVE_TILDE_NEWMAIL
-
-/* Define this to be the default user path if you don't like the default. 
-   See the --with-path=<path> configure option. */
-#undef DEFAULT_PATH
-
-/* Define this if O_NONBLOCK does not work on your system (e.g., Ultrix). */
-#undef O_NONBLOCK_BROKEN
-
-/* Define this if sys/syslog.h needs to be included in addition to syslog.h.
-   This is the case on some Ultrix versions. */
-#undef NEED_SYS_SYSLOG_H
-
-/* Define this to include IDEA encryption. */
-#undef WITH_IDEA
-
-/* Define this to include RC4 encryption. */
-#undef WITH_RC4
-
-/* Define this to include Blowfish encryption. */
-#undef WITH_BLOWFISH
-
-/* Define this to include libwrap (tcp_wrappers) support. */
-#undef LIBWRAP
-
-/* This is defined to pw_encrypt on Linux when using John Faugh's shadow 
-   password implementation. */
-#undef crypt
-
-/* This is defined on 386BSD to preted we are on FreeBSD. */
-#undef __FreeBSD__
-
-/* If defines, this overrides "tty" as the terminal group. */
-#undef TTY_GROUP
-
-/* Define this if you want to support Security Dynammics SecurID
-   cards. */
-#undef HAVE_SECURID
-
-/* Define this if you are using HPSUX.  HPUX uses non-standard shared
-   memory communication for X, which seems to be enabled by the display name
-   matching that of the local host.  This circumvents it by using the IP
-   address instead of the host name in DISPLAY. */
-#undef HPSUX_NONSTANDARD_X11_KLUDGE
-
-/* Define this if inet_network should be used instead of inet_addr.  This is
-   the case on DGUX 5.4. */
-#undef BROKEN_INET_ADDR
-
-/* Define this if your system does not like sizeof(struct sockaddr_un) as the
-   size argument in bind and connect calls for unix domain sockets. */
-#undef USE_STRLEN_FOR_AF_UNIX
-
-/* Define this to use pipes instead of socketpairs for communicating with the
-   client program.  Socketpairs do not seem to work on all systems. */
-#undef USE_PIPES
-
-/* Define this if speed_t is defined in stdtypes.h or otherwise gets included
-   into ttymodes.c from system headers. */
-#undef SPEED_T_IN_STDTYPES_H
-
-/* Define this if compiling with SOCKS (the firewall traversal library).
-   Also, you must define connect, getsockname, bind, accept, listen, and
-   select to their R-versions. */
-#undef SOCKS
-#undef connect
-#undef getsockname
-#undef bind
-#undef accept
-#undef listen
-#undef select
-
-/* Define these if on SCO Unix. */
-#undef HAVE_SCO_ETC_SHADOW
-#undef SCO
-
-/* Define this if you want to compile in Kerberos V4 support.
-   This can be done at configure time with the --with-krb4 argument. */
-#undef KRB4
-
-/* Define this if you want to compile in AFS support.
-   This can be done at configure time with the --with-afs argument. */
-#undef AFS
-
-/* Define this if you want to enable nonstandard krb4 TGT forwarding. */
-#undef KERBEROS_TGT_PASSING
-
-/* Define this if you want to add optional compression support. */
-#undef WITH_ZLIB
-
-/* The number of bytes in a int.  */
-#undef SIZEOF_INT
-
-/* The number of bytes in a long.  */
-#undef SIZEOF_LONG
-
-/* The number of bytes in a short.  */
-#undef SIZEOF_SHORT
-
-/* Define if you have the _getpty function.  */
-#undef HAVE__GETPTY
-
-/* Define if you have the clock function.  */
-#undef HAVE_CLOCK
-
-/* Define if you have the fchmod function.  */
-#undef HAVE_FCHMOD
-
-/* Define if you have the getdtablesize function.  */
-#undef HAVE_GETDTABLESIZE
-
-/* Define if you have the gethostname function.  */
-#undef HAVE_GETHOSTNAME
-
-/* Define if you have the getrusage function.  */
-#undef HAVE_GETRUSAGE
-
-/* Define if you have the gettimeofday function.  */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define if you have the initgroups function.  */
-#undef HAVE_INITGROUPS
-
-/* Define if you have the innetgr function.  */
-#undef HAVE_INNETGR
-
-/* Define if you have the memcpy function.  */
-#undef HAVE_MEMCPY
-
-/* Define if you have the memmove function.  */
-#undef HAVE_MEMMOVE
-
-/* Define if you have the openpty function.  */
-#undef HAVE_OPENPTY
-
-/* Define if you have the popen function.  */
-#undef HAVE_POPEN
-
-/* Define if you have the putenv function.  */
-#undef HAVE_PUTENV
-
-/* Define if you have the random function.  */
-#undef HAVE_RANDOM
-
-/* Define if you have the remove function.  */
-#undef HAVE_REMOVE
-
-/* Define if you have the seteuid function.  */
-#undef HAVE_SETEUID
-
-/* Define if you have the setlogin function.  */
-#undef HAVE_SETLOGIN
-
-/* Define if you have the setluid function.  */
-#undef HAVE_SETLUID
-
-/* Define if you have the setrlimit function.  */
-#undef HAVE_SETRLIMIT
-
-/* Define if you have the setsid function.  */
-#undef HAVE_SETSID
-
-/* Define if you have the socketpair function.  */
-#undef HAVE_SOCKETPAIR
-
-/* Define if you have the strchr function.  */
-#undef HAVE_STRCHR
-
-/* Define if you have the strerror function.  */
-#undef HAVE_STRERROR
-
-/* Define if you have the times function.  */
-#undef HAVE_TIMES
-
-/* Define if you have the ulimit function.  */
-#undef HAVE_ULIMIT
-
-/* Define if you have the umask function.  */
-#undef HAVE_UMASK
-
-/* Define if you have the vhangup function.  */
-#undef HAVE_VHANGUP
-
-/* Define if you have the vsnprintf function.  */
-#undef HAVE_VSNPRINTF
-
-/* Define if you have the <dirent.h> header file.  */
-#undef HAVE_DIRENT_H
-
-/* Define if you have the <gmp.h> header file.  */
-#undef HAVE_GMP_H
-
-/* Define if you have the <krb.h> header file.  */
-#undef HAVE_KRB_H
-
-/* Define if you have the <lastlog.h> header file.  */
-#undef HAVE_LASTLOG_H
-
-/* Define if you have the <ndir.h> header file.  */
-#undef HAVE_NDIR_H
-
-/* Define if you have the <netinet/in_systm.h> header file.  */
-#undef HAVE_NETINET_IN_SYSTM_H
-
-/* Define if you have the <paths.h> header file.  */
-#undef HAVE_PATHS_H
-
-/* Define if you have the <rusage.h> header file.  */
-#undef HAVE_RUSAGE_H
-
-/* Define if you have the <sgtty.h> header file.  */
-#undef HAVE_SGTTY_H
-
-/* Define if you have the <sys/dir.h> header file.  */
-#undef HAVE_SYS_DIR_H
-
-/* Define if you have the <sys/filio.h> header file.  */
-#undef HAVE_SYS_FILIO_H
-
-/* Define if you have the <sys/ioctl.h> header file.  */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define if you have the <sys/ndir.h> header file.  */
-#undef HAVE_SYS_NDIR_H
-
-/* Define if you have the <sys/select.h> header file.  */
-#undef HAVE_SYS_SELECT_H
-
-/* Define if you have the <sys/time.h> header file.  */
-#undef HAVE_SYS_TIME_H
-
-/* Define if you have the <termios.h> header file.  */
-#undef HAVE_TERMIOS_H
-
-/* Define if you have the <ulimit.h> header file.  */
-#undef HAVE_ULIMIT_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the <usersec.h> header file.  */
-#undef HAVE_USERSEC_H
-
-/* Define if you have the <utime.h> header file.  */
-#undef HAVE_UTIME_H
-
-/* Define if you have the <utmp.h> header file.  */
-#undef HAVE_UTMP_H
-
-/* Define if you have the <utmpx.h> header file.  */
-#undef HAVE_UTMPX_H
-
-/* Define if you have the <zlib.h> header file.  */
-#undef HAVE_ZLIB_H
-
-/* Define if you have the crypt library (-lcrypt).  */
-#undef HAVE_LIBCRYPT
-
-/* Define if you have the des library (-ldes).  */
-#undef HAVE_LIBDES
-
-/* Define if you have the gen library (-lgen).  */
-#undef HAVE_LIBGEN
-
-/* Define if you have the gmp library (-lgmp).  */
-#undef HAVE_LIBGMP
-
-/* Define if you have the krb library (-lkrb).  */
-#undef HAVE_LIBKRB
-
-/* Define if you have the nsl library (-lnsl).  */
-#undef HAVE_LIBNSL
-
-/* Define if you have the s library (-ls).  */
-#undef HAVE_LIBS
-
-/* Define if you have the security library (-lsecurity).  */
-#undef HAVE_LIBSECURITY
-
-/* Define if you have the socket library (-lsocket).  */
-#undef HAVE_LIBSOCKET
-
-/* Define if you have the sun library (-lsun).  */
-#undef HAVE_LIBSUN
-
-/* Define if you have the z library (-lz).  */
-#undef HAVE_LIBZ
diff --git a/usr.bin/ssh/config.log b/usr.bin/ssh/config.log
deleted file mode 100644
index b318101a081..00000000000
--- a/usr.bin/ssh/config.log
+++ /dev/null
@@ -1,420 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-configure:593: checking host system type
-configure:617: checking for gcc
-configure:730: checking whether the C compiler (gcc  ) works
-configure:746: gcc -o conftest    conftest.c  1>&5
-configure:772: checking whether the C compiler (gcc  ) is a cross-compiler
-configure:777: checking whether we are using GNU C
-configure:786: gcc -E conftest.c
-configure:805: checking whether gcc accepts -g
-configure:837: checking how to run the C preprocessor
-configure:858: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:1332: checking that the compiler works
-configure:1341: gcc -o conftest -g -O2   conftest.c  1>&5
-configure:1358: checking if the compiler understands -pipe
-configure:1369: gcc -pipe -c -g -O2  conftest.c 1>&5
-configure:1397: checking for vhangup
-configure:1425: gcc -pipe -o conftest -g -O2   conftest.c  1>&5
-configure:1419: Undefined symbol `_vhangup' referenced from text segment
-collect2: ld returned 1 exit status
-configure: failed program was:
-#line 1402 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char vhangup(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char vhangup();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_vhangup) || defined (__stub___vhangup)
-choke me
-#else
-vhangup();
-#endif
-
-; return 0; }
-configure:1455: checking for setsid
-configure:1483: gcc -pipe -o conftest -g -O2   conftest.c  1>&5
-configure:1510: checking where to find mandatory GMP library
-configure:1535: checking for gmp.h
-configure:1545: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:1577: checking for main in -lgmp
-configure:1592: gcc -pipe -o conftest -g -O2   conftest.c -lgmp   1>&5
-configure:1636: checking for _getpty
-configure:1664: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1658: Undefined symbol `__getpty' referenced from text segment
-collect2: ld returned 1 exit status
-configure: failed program was:
-#line 1641 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _getpty(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char _getpty();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub__getpty) || defined (__stub____getpty)
-choke me
-#else
-_getpty();
-#endif
-
-; return 0; }
-configure:1636: checking for clock
-configure:1664: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1636: checking for fchmod
-configure:1664: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1636: checking for getdtablesize
-configure:1664: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1636: checking for gethostname
-configure:1664: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1636: checking for getrusage
-configure:1664: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1691: checking for gettimeofday
-configure:1719: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1691: checking for initgroups
-configure:1719: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1691: checking for innetgr
-configure:1719: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1691: checking for memcpy
-configure:1719: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1703: warning: conflicting types for built-in function `memcpy'
-configure:1691: checking for openpty
-configure:1719: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1713: Undefined symbol `_openpty' referenced from text segment
-collect2: ld returned 1 exit status
-configure: failed program was:
-#line 1696 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char openpty(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char openpty();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_openpty) || defined (__stub___openpty)
-choke me
-#else
-openpty();
-#endif
-
-; return 0; }
-configure:1691: checking for popen
-configure:1719: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1691: checking for seteuid
-configure:1719: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1746: checking for setlogin
-configure:1774: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1746: checking for setluid
-configure:1774: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1768: Undefined symbol `_setluid' referenced from text segment
-collect2: ld returned 1 exit status
-configure: failed program was:
-#line 1751 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char setluid(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char setluid();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_setluid) || defined (__stub___setluid)
-choke me
-#else
-setluid();
-#endif
-
-; return 0; }
-configure:1746: checking for setrlimit
-configure:1774: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1746: checking for strchr
-configure:1774: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1746: checking for times
-configure:1774: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1746: checking for ulimit
-configure:1774: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1768: Undefined symbol `_ulimit' referenced from text segment
-collect2: ld returned 1 exit status
-configure: failed program was:
-#line 1751 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char ulimit(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char ulimit();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_ulimit) || defined (__stub___ulimit)
-choke me
-#else
-ulimit();
-#endif
-
-; return 0; }
-configure:1746: checking for umask
-configure:1774: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1746: checking for vsnprintf
-configure:1774: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1800: checking return type of signal handlers
-configure:1822: gcc -pipe -c -g -O2  conftest.c 1>&5
-configure:1841: checking for ANSI C header files
-configure:1854: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:1921: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:1945: checking for size_t
-configure:1978: checking for uid_t in sys/types.h
-configure:2012: checking for off_t
-configure:2045: checking for mode_t
-configure:2078: checking for st_blksize in struct stat
-configure:2091: gcc -pipe -c -g -O2  conftest.c 1>&5
-configure:2113: checking for working const
-configure:2167: gcc -pipe -c -g -O2  conftest.c 1>&5
-configure:2188: checking for inline
-configure:2202: gcc -pipe -c -g -O2  conftest.c 1>&5
-configure:2228: checking whether byte ordering is bigendian
-configure:2246: gcc -pipe -c -g -O2  conftest.c 1>&5
-configure:2261: gcc -pipe -c -g -O2  conftest.c 1>&5
-configure: In function `main':
-configure:2256: syntax error before `big'
-configure: failed program was:
-#line 2250 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
-
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-; return 0; }
-configure:2318: checking size of long
-configure:2337: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:2357: checking size of int
-configure:2376: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:2396: checking size of short
-configure:2415: gcc -pipe -o conftest -g -O2   conftest.c -lgmp  1>&5
-configure:2440: checking for termios.h
-configure:2450: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2479: checking for ANSI C header files
-configure:2583: checking for sys/wait.h that is POSIX.1 compatible
-configure:2604: gcc -pipe -c -g -O2  conftest.c 1>&5
-configure:2628: checking for unistd.h
-configure:2638: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2628: checking for rusage.h
-configure:2638: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2634: rusage.h: No such file or directory
-configure: failed program was:
-#line 2633 "configure"
-#include "confdefs.h"
-#include <rusage.h>
-configure:2628: checking for sys/time.h
-configure:2638: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2628: checking for lastlog.h
-configure:2638: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2634: lastlog.h: No such file or directory
-configure: failed program was:
-#line 2633 "configure"
-#include "confdefs.h"
-#include <lastlog.h>
-configure:2628: checking for utmp.h
-configure:2638: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2628: checking for utmpx.h
-configure:2638: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2634: utmpx.h: No such file or directory
-configure: failed program was:
-#line 2633 "configure"
-#include "confdefs.h"
-#include <utmpx.h>
-configure:2668: checking for sgtty.h
-configure:2678: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2668: checking for sys/select.h
-configure:2678: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2668: checking for sys/ioctl.h
-configure:2678: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2668: checking for sys/filio.h
-configure:2678: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2708: checking for paths.h
-configure:2718: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2708: checking for usersec.h
-configure:2718: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2714: usersec.h: No such file or directory
-configure: failed program was:
-#line 2713 "configure"
-#include "confdefs.h"
-#include <usersec.h>
-configure:2708: checking for utime.h
-configure:2718: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2708: checking for netinet/in_systm.h
-configure:2718: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2708: checking for ulimit.h
-configure:2718: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:2714: ulimit.h: No such file or directory
-configure: failed program was:
-#line 2713 "configure"
-#include "confdefs.h"
-#include <ulimit.h>
-configure:2745: checking whether time.h and sys/time.h may both be included
-configure:2759: gcc -pipe -c -g -O2  conftest.c 1>&5
-configure:2784: checking for dirent.h that defines DIR
-configure:2797: gcc -pipe -c -g -O2  conftest.c 1>&5
-configure:2822: checking for opendir in -ldir
-configure:2841: gcc -pipe -o conftest -g -O2   conftest.c -ldir  -lgmp  1>&5
-ld: -ldir: no match
-collect2: ld returned 1 exit status
-configure: failed program was:
-#line 2830 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char opendir();
-
-int main() {
-opendir()
-; return 0; }
-configure:2905: checking whether stat file-mode macros are broken
-configure:3038: utmpx.h: No such file or directory
-configure:3053: utmpx.h: No such file or directory
-configure:3068: checking for crypt in -lc
-configure:3087: gcc -pipe -o conftest -g -O2   conftest.c -lc  -lgmp  1>&5
-configure:3155: checking for main in -lnsl
-configure:3170: gcc -pipe -o conftest -g -O2   conftest.c -lnsl  -lgmp  1>&5
-ld: -lnsl: no match
-collect2: ld returned 1 exit status
-configure: failed program was:
-#line 3163 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-configure:3199: checking for socket in -lsocket
-configure:3218: gcc -pipe -o conftest -g -O2   conftest.c -lsocket  -lgmp  1>&5
-ld: -lsocket: no match
-collect2: ld returned 1 exit status
-configure: failed program was:
-#line 3207 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char socket();
-
-int main() {
-socket()
-; return 0; }
-configure:3248: checking for getpwnam in -lsun
-configure:3267: gcc -pipe -o conftest -g -O2   conftest.c -lsun  -lgmp  1>&5
-ld: -lsun: no match
-collect2: ld returned 1 exit status
-configure: failed program was:
-#line 3256 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getpwnam();
-
-int main() {
-getpwnam()
-; return 0; }
-configure:3296: checking for login in -lutil
-configure:3315: gcc -pipe -o conftest -g -O2   conftest.c -lutil  -lgmp  1>&5
-configure:3341: checking for main in -ldes
-configure:3356: gcc -pipe -o conftest -g -O2   conftest.c -ldes  -lgmp  -lutil 1>&5
-configure:3387: checking for strerror
-configure:3415: gcc -pipe -o conftest -g -O2   conftest.c -ldes -lgmp  -lutil 1>&5
-configure:3387: checking for memmove
-configure:3415: gcc -pipe -o conftest -g -O2   conftest.c -ldes -lgmp  -lutil 1>&5
-configure:3387: checking for remove
-configure:3415: gcc -pipe -o conftest -g -O2   conftest.c -ldes -lgmp  -lutil 1>&5
-configure:3387: checking for random
-configure:3415: gcc -pipe -o conftest -g -O2   conftest.c -ldes -lgmp  -lutil 1>&5
-configure:3387: checking for putenv
-configure:3415: gcc -pipe -o conftest -g -O2   conftest.c -ldes -lgmp  -lutil 1>&5
-configure:3387: checking for socketpair
-configure:3415: gcc -pipe -o conftest -g -O2   conftest.c -ldes -lgmp  -lutil 1>&5
-configure:3443: checking whether ln -s works
-configure:3475: checking for a BSD compatible install
-configure:3531: checking for ranlib
-configure:3566: checking for makedepend
-configure:3601: checking for wish8.0
-configure:3601: checking for wish
-configure:3601: checking for wishx
-configure:3601: checking for wish4.1
-configure:3601: checking for true
-configure:3643: checking for xauth
-configure:3683: checking for pseudo ttys
-configure:3705: checking for /etc/default/login
-configure:3718: checking for shadow passwords
-configure:3743: checking location of mail spool files
-configure:3764: checking location of utmp
-configure:3800: checking location of wtmp
-configure:3834: checking location of lastlog
-configure:3889: checking whether /var/log/lastlog is a directory
-configure:3902: checking whether to include the IDEA encryption algorithm
-configure:3926: checking whether to include the RC4 encryption algorithm
-configure:3950: checking whether to include the Blowfish encryption algorithm
-configure:3982: checking whether to use rsaref
-configure:4008: checking whether to use ssl
-configure:4032: checking whether to use rsh
-configure:4102: checking for remsh
-configure:4102: checking for rsh
-configure:4147: checking default path
-configure:4170: checking etcdir
-configure:4195: checking whether to support SecurID
-configure:4238: checking whether to include compression support
-configure:4262: checking for zlib.h
-configure:4272: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:4303: checking for main in -lz
-configure:4318: gcc -pipe -o conftest -g -O2   conftest.c -lz  -lcrypto -ldes -lgmp  -lutil 1>&5
-configure:4361: checking whether to use Kerberos v4
-configure:4530: checking for krb.h
-configure:4540: gcc -E  conftest.c >/dev/null 2>conftest.out
-configure:4536: krb.h: No such file or directory
-configure: failed program was:
-#line 4535 "configure"
-#include "confdefs.h"
-#include <krb.h>
-configure:4567: checking for main in -lkrb
-configure:4582: gcc -pipe -o conftest -g -O2   conftest.c -lkrb  -lz -lcrypto -ldes -lgmp  -lutil 1>&5
-configure:4717: checking whether to use AFS
-configure:4749: checking whether to use libwrap
-configure:4815: checking whether to support SOCKS
-configure:4884: checking where to put sshd.pid
diff --git a/usr.bin/ssh/config.sample b/usr.bin/ssh/config.sample
deleted file mode 100644
index 34daeee5630..00000000000
--- a/usr.bin/ssh/config.sample
+++ /dev/null
@@ -1,62 +0,0 @@
-# This is a sample per-user ssh configuration file.  This file could be
-# the user's .ssh/config.
-
-# Configuration data is parsed as follows:
-#  1. command line options
-#  2. user-specific file
-#  3. system-wide file
-# Any configuration value is only changed the first time it is set.
-# Thus, host-specific definitions should be at the beginning of the
-# configuration file, and defaults at the end.
-
-# System defaults will be used for anything not explicitly specified
-# in this file.
-
-Host fake
-  HostName sparc.ngs.fi
-  UseRsh yes
-
-Host pooh
-  HostName pooh.tky.hut.fi
-
-Host shadows.cs.hut.fi shadows
-  RhostsAuthentication yes
-  KeepAlive no
-  RemoteForward 30000 olari.clinet.fi:23
-  LocalForward 30001 lk-hp-13.hut.fi:23
-  IdentityFile ~/.identityfiles/shadows
-
-Host ngs.fi *.ngs.fi
-  RhostsAuthentication no
-  FallBackToRsh no
-  PasswordAuthentication no
-  IdentityFile ~/.identityfiles/ngs
-  KeepAlive no
-  Compression yes
-  CompressionLevel 9
-
-Host *.fr
-  UseRsh yes
-
-Host *.su
-  FallBackToRsh yes
-  Cipher none
-  PasswordAuthentication no
-  ForwardAgent no
-
-Host *.com *.edu *.gov *.mil *.org *.de *.uk
-  Cipher 3des
-  ForwardAgent no
-
-# Defaults for various options
-Host *
-  ForwardAgent yes
-  ForwardX11 yes
-  RhostsAuthentication yes
-  PasswordAuthentication yes
-  RSAAuthentication yes
-  FallBackToRsh no
-  UseRsh no
-  IdentityFile ~/.ssh/identity
-  Port 22
-  Cipher idea
diff --git a/usr.bin/ssh/config.status b/usr.bin/ssh/config.status
deleted file mode 100644
index 63dfa66413e..00000000000
--- a/usr.bin/ssh/config.status
+++ /dev/null
@@ -1,536 +0,0 @@
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host cvs.openbsd.org:
-#
-# ./configure  --with-ssl
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: ./config.status [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running ${CONFIG_SHELL-/bin/sh} ./configure  --with-ssl --no-create --no-recursion"
-    exec ${CONFIG_SHELL-/bin/sh} ./configure  --with-ssl --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "./config.status generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "$ac_cs_usage"; exit 0 ;;
-  *) echo "$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=.
-ac_given_INSTALL="/usr/bin/install -c"
-
-trap 'rm -fr Makefile sshd.8 ssh.1 config.h conftest*; exit 1' 1 2 15
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
-/^[ 	]*VPATH[ 	]*=[^:]*$/d
-
-s%@SHELL@%/bin/sh%g
-s%@CFLAGS@%-g -O2%g
-s%@CPPFLAGS@%%g
-s%@CXXFLAGS@%%g
-s%@FFLAGS@%%g
-s%@DEFS@%-DHAVE_CONFIG_H%g
-s%@LDFLAGS@%%g
-s%@LIBS@%-lkrb -lz -lcrypto -ldes -lgmp  -lutil%g
-s%@exec_prefix@%${prefix}%g
-s%@prefix@%/usr/local%g
-s%@program_transform_name@%s,x,x,%g
-s%@bindir@%${exec_prefix}/bin%g
-s%@sbindir@%${exec_prefix}/sbin%g
-s%@libexecdir@%${exec_prefix}/libexec%g
-s%@datadir@%${prefix}/share%g
-s%@sysconfdir@%${prefix}/etc%g
-s%@sharedstatedir@%${prefix}/com%g
-s%@localstatedir@%${prefix}/var%g
-s%@libdir@%${exec_prefix}/lib%g
-s%@includedir@%${prefix}/include%g
-s%@oldincludedir@%/usr/include%g
-s%@infodir@%${prefix}/info%g
-s%@mandir@%${prefix}/man%g
-s%@host@%i386-unknown-openbsd2.5%g
-s%@host_alias@%i386-unknown-openbsd2.5%g
-s%@host_cpu@%i386%g
-s%@host_vendor@%unknown%g
-s%@host_os@%openbsd2.5%g
-s%@CC@%gcc -pipe%g
-s%@CPP@%gcc -E%g
-s%@GMPINCS@%%g
-s%@GMPLIBS@%-lgmp%g
-s%@LIBOBJS@%%g
-s%@LN_S@%ln -s%g
-s%@INSTALL_PROGRAM@%${INSTALL}%g
-s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g
-s%@INSTALL_DATA@%${INSTALL} -m 644%g
-s%@RANLIB@%ranlib%g
-s%@MAKEDEP@%makedepend%g
-s%@WISH@%/usr/local/bin/wish%g
-s%@XAUTH_PATH@%/usr/X11R6/bin/xauth%g
-s%@RSH_PATH@%/usr/bin/rsh%g
-s%@KRB4_AUTH@%%g
-s%@KRB4_ROOT@%%g
-s%@KRB4_INCS@%%g
-s%@KRB4_LIBS@%%g
-s%@RADIX@%%g
-s%@ETCDIR@%/etc%g
-s%@PIDDIR@%/var/run%g
-s%@RSAREFDEP@%%g
-s%@CONFOBJS@% bf_skey.o bf_enc.o compress.o%g
-
-CEOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-
-CONFIG_FILES=${CONFIG_FILES-"Makefile sshd.8 ssh.1"}
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-  CONFIG_HEADERS="config.h"
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}USE_PIPES${ac_dB}USE_PIPES${ac_dC}1${ac_dD}
-${ac_uA}USE_PIPES${ac_uB}USE_PIPES${ac_uC}1${ac_uD}
-${ac_eA}USE_PIPES${ac_eB}USE_PIPES${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SETSID${ac_dB}HAVE_SETSID${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SETSID${ac_uB}HAVE_SETSID${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SETSID${ac_eB}HAVE_SETSID${ac_eC}1${ac_eD}
-${ac_dA}HAVE_GMP_H${ac_dB}HAVE_GMP_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_GMP_H${ac_uB}HAVE_GMP_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_GMP_H${ac_eB}HAVE_GMP_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_LIBGMP${ac_dB}HAVE_LIBGMP${ac_dC}1${ac_dD}
-${ac_uA}HAVE_LIBGMP${ac_uB}HAVE_LIBGMP${ac_uC}1${ac_uD}
-${ac_eA}HAVE_LIBGMP${ac_eB}HAVE_LIBGMP${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}HAVE_CLOCK${ac_dB}HAVE_CLOCK${ac_dC}1${ac_dD}
-${ac_uA}HAVE_CLOCK${ac_uB}HAVE_CLOCK${ac_uC}1${ac_uD}
-${ac_eA}HAVE_CLOCK${ac_eB}HAVE_CLOCK${ac_eC}1${ac_eD}
-${ac_dA}HAVE_FCHMOD${ac_dB}HAVE_FCHMOD${ac_dC}1${ac_dD}
-${ac_uA}HAVE_FCHMOD${ac_uB}HAVE_FCHMOD${ac_uC}1${ac_uD}
-${ac_eA}HAVE_FCHMOD${ac_eB}HAVE_FCHMOD${ac_eC}1${ac_eD}
-${ac_dA}HAVE_GETDTABLESIZE${ac_dB}HAVE_GETDTABLESIZE${ac_dC}1${ac_dD}
-${ac_uA}HAVE_GETDTABLESIZE${ac_uB}HAVE_GETDTABLESIZE${ac_uC}1${ac_uD}
-${ac_eA}HAVE_GETDTABLESIZE${ac_eB}HAVE_GETDTABLESIZE${ac_eC}1${ac_eD}
-${ac_dA}HAVE_GETHOSTNAME${ac_dB}HAVE_GETHOSTNAME${ac_dC}1${ac_dD}
-${ac_uA}HAVE_GETHOSTNAME${ac_uB}HAVE_GETHOSTNAME${ac_uC}1${ac_uD}
-${ac_eA}HAVE_GETHOSTNAME${ac_eB}HAVE_GETHOSTNAME${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}HAVE_GETRUSAGE${ac_dB}HAVE_GETRUSAGE${ac_dC}1${ac_dD}
-${ac_uA}HAVE_GETRUSAGE${ac_uB}HAVE_GETRUSAGE${ac_uC}1${ac_uD}
-${ac_eA}HAVE_GETRUSAGE${ac_eB}HAVE_GETRUSAGE${ac_eC}1${ac_eD}
-${ac_dA}HAVE_GETTIMEOFDAY${ac_dB}HAVE_GETTIMEOFDAY${ac_dC}1${ac_dD}
-${ac_uA}HAVE_GETTIMEOFDAY${ac_uB}HAVE_GETTIMEOFDAY${ac_uC}1${ac_uD}
-${ac_eA}HAVE_GETTIMEOFDAY${ac_eB}HAVE_GETTIMEOFDAY${ac_eC}1${ac_eD}
-${ac_dA}HAVE_INITGROUPS${ac_dB}HAVE_INITGROUPS${ac_dC}1${ac_dD}
-${ac_uA}HAVE_INITGROUPS${ac_uB}HAVE_INITGROUPS${ac_uC}1${ac_uD}
-${ac_eA}HAVE_INITGROUPS${ac_eB}HAVE_INITGROUPS${ac_eC}1${ac_eD}
-${ac_dA}HAVE_INNETGR${ac_dB}HAVE_INNETGR${ac_dC}1${ac_dD}
-${ac_uA}HAVE_INNETGR${ac_uB}HAVE_INNETGR${ac_uC}1${ac_uD}
-${ac_eA}HAVE_INNETGR${ac_eB}HAVE_INNETGR${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}HAVE_MEMCPY${ac_dB}HAVE_MEMCPY${ac_dC}1${ac_dD}
-${ac_uA}HAVE_MEMCPY${ac_uB}HAVE_MEMCPY${ac_uC}1${ac_uD}
-${ac_eA}HAVE_MEMCPY${ac_eB}HAVE_MEMCPY${ac_eC}1${ac_eD}
-${ac_dA}HAVE_POPEN${ac_dB}HAVE_POPEN${ac_dC}1${ac_dD}
-${ac_uA}HAVE_POPEN${ac_uB}HAVE_POPEN${ac_uC}1${ac_uD}
-${ac_eA}HAVE_POPEN${ac_eB}HAVE_POPEN${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SETEUID${ac_dB}HAVE_SETEUID${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SETEUID${ac_uB}HAVE_SETEUID${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SETEUID${ac_eB}HAVE_SETEUID${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SETLOGIN${ac_dB}HAVE_SETLOGIN${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SETLOGIN${ac_uB}HAVE_SETLOGIN${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SETLOGIN${ac_eB}HAVE_SETLOGIN${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}HAVE_SETRLIMIT${ac_dB}HAVE_SETRLIMIT${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SETRLIMIT${ac_uB}HAVE_SETRLIMIT${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SETRLIMIT${ac_eB}HAVE_SETRLIMIT${ac_eC}1${ac_eD}
-${ac_dA}HAVE_STRCHR${ac_dB}HAVE_STRCHR${ac_dC}1${ac_dD}
-${ac_uA}HAVE_STRCHR${ac_uB}HAVE_STRCHR${ac_uC}1${ac_uD}
-${ac_eA}HAVE_STRCHR${ac_eB}HAVE_STRCHR${ac_eC}1${ac_eD}
-${ac_dA}HAVE_TIMES${ac_dB}HAVE_TIMES${ac_dC}1${ac_dD}
-${ac_uA}HAVE_TIMES${ac_uB}HAVE_TIMES${ac_uC}1${ac_uD}
-${ac_eA}HAVE_TIMES${ac_eB}HAVE_TIMES${ac_eC}1${ac_eD}
-${ac_dA}HAVE_UMASK${ac_dB}HAVE_UMASK${ac_dC}1${ac_dD}
-${ac_uA}HAVE_UMASK${ac_uB}HAVE_UMASK${ac_uC}1${ac_uD}
-${ac_eA}HAVE_UMASK${ac_eB}HAVE_UMASK${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}HAVE_VSNPRINTF${ac_dB}HAVE_VSNPRINTF${ac_dC}1${ac_dD}
-${ac_uA}HAVE_VSNPRINTF${ac_uB}HAVE_VSNPRINTF${ac_uC}1${ac_uD}
-${ac_eA}HAVE_VSNPRINTF${ac_eB}HAVE_VSNPRINTF${ac_eC}1${ac_eD}
-${ac_dA}RETSIGTYPE${ac_dB}RETSIGTYPE${ac_dC}void${ac_dD}
-${ac_uA}RETSIGTYPE${ac_uB}RETSIGTYPE${ac_uC}void${ac_uD}
-${ac_eA}RETSIGTYPE${ac_eB}RETSIGTYPE${ac_eC}void${ac_eD}
-${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD}
-${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD}
-${ac_eA}STDC_HEADERS${ac_eB}STDC_HEADERS${ac_eC}1${ac_eD}
-${ac_dA}HAVE_ST_BLKSIZE${ac_dB}HAVE_ST_BLKSIZE${ac_dC}1${ac_dD}
-${ac_uA}HAVE_ST_BLKSIZE${ac_uB}HAVE_ST_BLKSIZE${ac_uC}1${ac_uD}
-${ac_eA}HAVE_ST_BLKSIZE${ac_eB}HAVE_ST_BLKSIZE${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}SIZEOF_LONG${ac_dB}SIZEOF_LONG${ac_dC}4${ac_dD}
-${ac_uA}SIZEOF_LONG${ac_uB}SIZEOF_LONG${ac_uC}4${ac_uD}
-${ac_eA}SIZEOF_LONG${ac_eB}SIZEOF_LONG${ac_eC}4${ac_eD}
-${ac_dA}SIZEOF_INT${ac_dB}SIZEOF_INT${ac_dC}4${ac_dD}
-${ac_uA}SIZEOF_INT${ac_uB}SIZEOF_INT${ac_uC}4${ac_uD}
-${ac_eA}SIZEOF_INT${ac_eB}SIZEOF_INT${ac_eC}4${ac_eD}
-${ac_dA}SIZEOF_SHORT${ac_dB}SIZEOF_SHORT${ac_dC}2${ac_dD}
-${ac_uA}SIZEOF_SHORT${ac_uB}SIZEOF_SHORT${ac_uC}2${ac_uD}
-${ac_eA}SIZEOF_SHORT${ac_eB}SIZEOF_SHORT${ac_eC}2${ac_eD}
-${ac_dA}HAVE_TERMIOS_H${ac_dB}HAVE_TERMIOS_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_TERMIOS_H${ac_uB}HAVE_TERMIOS_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_TERMIOS_H${ac_eB}HAVE_TERMIOS_H${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD}
-${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD}
-${ac_eA}STDC_HEADERS${ac_eB}STDC_HEADERS${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SYS_WAIT_H${ac_dB}HAVE_SYS_WAIT_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SYS_WAIT_H${ac_uB}HAVE_SYS_WAIT_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SYS_WAIT_H${ac_eB}HAVE_SYS_WAIT_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_UNISTD_H${ac_eB}HAVE_UNISTD_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SYS_TIME_H${ac_dB}HAVE_SYS_TIME_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SYS_TIME_H${ac_uB}HAVE_SYS_TIME_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SYS_TIME_H${ac_eB}HAVE_SYS_TIME_H${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}HAVE_UTMP_H${ac_dB}HAVE_UTMP_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_UTMP_H${ac_uB}HAVE_UTMP_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_UTMP_H${ac_eB}HAVE_UTMP_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SGTTY_H${ac_dB}HAVE_SGTTY_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SGTTY_H${ac_uB}HAVE_SGTTY_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SGTTY_H${ac_eB}HAVE_SGTTY_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SYS_SELECT_H${ac_dB}HAVE_SYS_SELECT_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SYS_SELECT_H${ac_uB}HAVE_SYS_SELECT_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SYS_SELECT_H${ac_eB}HAVE_SYS_SELECT_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SYS_IOCTL_H${ac_dB}HAVE_SYS_IOCTL_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SYS_IOCTL_H${ac_uB}HAVE_SYS_IOCTL_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SYS_IOCTL_H${ac_eB}HAVE_SYS_IOCTL_H${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}HAVE_SYS_FILIO_H${ac_dB}HAVE_SYS_FILIO_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SYS_FILIO_H${ac_uB}HAVE_SYS_FILIO_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SYS_FILIO_H${ac_eB}HAVE_SYS_FILIO_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_PATHS_H${ac_dB}HAVE_PATHS_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_PATHS_H${ac_uB}HAVE_PATHS_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_PATHS_H${ac_eB}HAVE_PATHS_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_UTIME_H${ac_dB}HAVE_UTIME_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_UTIME_H${ac_uB}HAVE_UTIME_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_UTIME_H${ac_eB}HAVE_UTIME_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_NETINET_IN_SYSTM_H${ac_dB}HAVE_NETINET_IN_SYSTM_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_NETINET_IN_SYSTM_H${ac_uB}HAVE_NETINET_IN_SYSTM_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_NETINET_IN_SYSTM_H${ac_eB}HAVE_NETINET_IN_SYSTM_H${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}TIME_WITH_SYS_TIME${ac_dB}TIME_WITH_SYS_TIME${ac_dC}1${ac_dD}
-${ac_uA}TIME_WITH_SYS_TIME${ac_uB}TIME_WITH_SYS_TIME${ac_uC}1${ac_uD}
-${ac_eA}TIME_WITH_SYS_TIME${ac_eB}TIME_WITH_SYS_TIME${ac_eC}1${ac_eD}
-${ac_dA}HAVE_DIRENT_H${ac_dB}HAVE_DIRENT_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_DIRENT_H${ac_uB}HAVE_DIRENT_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_DIRENT_H${ac_eB}HAVE_DIRENT_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_NAME_IN_UTMP${ac_dB}HAVE_NAME_IN_UTMP${ac_dC}1${ac_dD}
-${ac_uA}HAVE_NAME_IN_UTMP${ac_uB}HAVE_NAME_IN_UTMP${ac_uC}1${ac_uD}
-${ac_eA}HAVE_NAME_IN_UTMP${ac_eB}HAVE_NAME_IN_UTMP${ac_eC}1${ac_eD}
-${ac_dA}HAVE_HOST_IN_UTMP${ac_dB}HAVE_HOST_IN_UTMP${ac_dC}1${ac_dD}
-${ac_uA}HAVE_HOST_IN_UTMP${ac_uB}HAVE_HOST_IN_UTMP${ac_uC}1${ac_uD}
-${ac_eA}HAVE_HOST_IN_UTMP${ac_eB}HAVE_HOST_IN_UTMP${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}HAVE_LIBUTIL_LOGIN${ac_dB}HAVE_LIBUTIL_LOGIN${ac_dC}1${ac_dD}
-${ac_uA}HAVE_LIBUTIL_LOGIN${ac_uB}HAVE_LIBUTIL_LOGIN${ac_uC}1${ac_uD}
-${ac_eA}HAVE_LIBUTIL_LOGIN${ac_eB}HAVE_LIBUTIL_LOGIN${ac_eC}1${ac_eD}
-${ac_dA}HAVE_LIBDES${ac_dB}HAVE_LIBDES${ac_dC}1${ac_dD}
-${ac_uA}HAVE_LIBDES${ac_uB}HAVE_LIBDES${ac_uC}1${ac_uD}
-${ac_eA}HAVE_LIBDES${ac_eB}HAVE_LIBDES${ac_eC}1${ac_eD}
-${ac_dA}HAVE_STRERROR${ac_dB}HAVE_STRERROR${ac_dC}1${ac_dD}
-${ac_uA}HAVE_STRERROR${ac_uB}HAVE_STRERROR${ac_uC}1${ac_uD}
-${ac_eA}HAVE_STRERROR${ac_eB}HAVE_STRERROR${ac_eC}1${ac_eD}
-${ac_dA}HAVE_MEMMOVE${ac_dB}HAVE_MEMMOVE${ac_dC}1${ac_dD}
-${ac_uA}HAVE_MEMMOVE${ac_uB}HAVE_MEMMOVE${ac_uC}1${ac_uD}
-${ac_eA}HAVE_MEMMOVE${ac_eB}HAVE_MEMMOVE${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}HAVE_REMOVE${ac_dB}HAVE_REMOVE${ac_dC}1${ac_dD}
-${ac_uA}HAVE_REMOVE${ac_uB}HAVE_REMOVE${ac_uC}1${ac_uD}
-${ac_eA}HAVE_REMOVE${ac_eB}HAVE_REMOVE${ac_eC}1${ac_eD}
-${ac_dA}HAVE_RANDOM${ac_dB}HAVE_RANDOM${ac_dC}1${ac_dD}
-${ac_uA}HAVE_RANDOM${ac_uB}HAVE_RANDOM${ac_uC}1${ac_uD}
-${ac_eA}HAVE_RANDOM${ac_eB}HAVE_RANDOM${ac_eC}1${ac_eD}
-${ac_dA}HAVE_PUTENV${ac_dB}HAVE_PUTENV${ac_dC}1${ac_dD}
-${ac_uA}HAVE_PUTENV${ac_uB}HAVE_PUTENV${ac_uC}1${ac_uD}
-${ac_eA}HAVE_PUTENV${ac_eB}HAVE_PUTENV${ac_eC}1${ac_eD}
-${ac_dA}HAVE_SOCKETPAIR${ac_dB}HAVE_SOCKETPAIR${ac_dC}1${ac_dD}
-${ac_uA}HAVE_SOCKETPAIR${ac_uB}HAVE_SOCKETPAIR${ac_uC}1${ac_uD}
-${ac_eA}HAVE_SOCKETPAIR${ac_eB}HAVE_SOCKETPAIR${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}XAUTH_PATH${ac_dB}XAUTH_PATH${ac_dC}"/usr/X11R6/bin/xauth"${ac_dD}
-${ac_uA}XAUTH_PATH${ac_uB}XAUTH_PATH${ac_uC}"/usr/X11R6/bin/xauth"${ac_uD}
-${ac_eA}XAUTH_PATH${ac_eB}XAUTH_PATH${ac_eC}"/usr/X11R6/bin/xauth"${ac_eD}
-${ac_dA}MAIL_SPOOL_DIRECTORY${ac_dB}MAIL_SPOOL_DIRECTORY${ac_dC}"/var/mail"${ac_dD}
-${ac_uA}MAIL_SPOOL_DIRECTORY${ac_uB}MAIL_SPOOL_DIRECTORY${ac_uC}"/var/mail"${ac_uD}
-${ac_eA}MAIL_SPOOL_DIRECTORY${ac_eB}MAIL_SPOOL_DIRECTORY${ac_eC}"/var/mail"${ac_eD}
-${ac_dA}SSH_UTMP${ac_dB}SSH_UTMP${ac_dC}"/var/run/utmp"${ac_dD}
-${ac_uA}SSH_UTMP${ac_uB}SSH_UTMP${ac_uC}"/var/run/utmp"${ac_uD}
-${ac_eA}SSH_UTMP${ac_eB}SSH_UTMP${ac_eC}"/var/run/utmp"${ac_eD}
-${ac_dA}SSH_WTMP${ac_dB}SSH_WTMP${ac_dC}"/var/log/wtmp"${ac_dD}
-${ac_uA}SSH_WTMP${ac_uB}SSH_WTMP${ac_uC}"/var/log/wtmp"${ac_uD}
-${ac_eA}SSH_WTMP${ac_eB}SSH_WTMP${ac_eC}"/var/log/wtmp"${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}SSH_LASTLOG${ac_dB}SSH_LASTLOG${ac_dC}"/var/log/lastlog"${ac_dD}
-${ac_uA}SSH_LASTLOG${ac_uB}SSH_LASTLOG${ac_uC}"/var/log/lastlog"${ac_uD}
-${ac_eA}SSH_LASTLOG${ac_eB}SSH_LASTLOG${ac_eC}"/var/log/lastlog"${ac_eD}
-${ac_dA}HAVE_LASTLOG${ac_dB}HAVE_LASTLOG${ac_dC}1${ac_dD}
-${ac_uA}HAVE_LASTLOG${ac_uB}HAVE_LASTLOG${ac_uC}1${ac_uD}
-${ac_eA}HAVE_LASTLOG${ac_eB}HAVE_LASTLOG${ac_eC}1${ac_eD}
-${ac_dA}WITH_BLOWFISH${ac_dB}WITH_BLOWFISH${ac_dC}1${ac_dD}
-${ac_uA}WITH_BLOWFISH${ac_uB}WITH_BLOWFISH${ac_uC}1${ac_uD}
-${ac_eA}WITH_BLOWFISH${ac_eB}WITH_BLOWFISH${ac_eC}1${ac_eD}
-${ac_dA}DO_SSL${ac_dB}DO_SSL${ac_dC}1${ac_dD}
-${ac_uA}DO_SSL${ac_uB}DO_SSL${ac_uC}1${ac_uD}
-${ac_eA}DO_SSL${ac_eB}DO_SSL${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}RSH_PATH${ac_dB}RSH_PATH${ac_dC}"/usr/bin/rsh"${ac_dD}
-${ac_uA}RSH_PATH${ac_uB}RSH_PATH${ac_uC}"/usr/bin/rsh"${ac_uD}
-${ac_eA}RSH_PATH${ac_eB}RSH_PATH${ac_eC}"/usr/bin/rsh"${ac_eD}
-${ac_dA}HAVE_ZLIB_H${ac_dB}HAVE_ZLIB_H${ac_dC}1${ac_dD}
-${ac_uA}HAVE_ZLIB_H${ac_uB}HAVE_ZLIB_H${ac_uC}1${ac_uD}
-${ac_eA}HAVE_ZLIB_H${ac_eB}HAVE_ZLIB_H${ac_eC}1${ac_eD}
-${ac_dA}HAVE_LIBZ${ac_dB}HAVE_LIBZ${ac_dC}1${ac_dD}
-${ac_uA}HAVE_LIBZ${ac_uB}HAVE_LIBZ${ac_uC}1${ac_uD}
-${ac_eA}HAVE_LIBZ${ac_eB}HAVE_LIBZ${ac_eC}1${ac_eD}
-${ac_dA}WITH_ZLIB${ac_dB}WITH_ZLIB${ac_dC}1${ac_dD}
-${ac_uA}WITH_ZLIB${ac_uB}WITH_ZLIB${ac_uC}1${ac_uD}
-${ac_eA}WITH_ZLIB${ac_eB}WITH_ZLIB${ac_eC}1${ac_eD}
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  cat > conftest.frag <<CEOF
-${ac_dA}HAVE_LIBKRB${ac_dB}HAVE_LIBKRB${ac_dC}1${ac_dD}
-${ac_uA}HAVE_LIBKRB${ac_uB}HAVE_LIBKRB${ac_uC}1${ac_uD}
-${ac_eA}HAVE_LIBKRB${ac_eB}HAVE_LIBKRB${ac_eC}1${ac_eD}
-s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
-  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
-  fi
-fi; done
-
-
-
-exit 0
diff --git a/usr.bin/ssh/config.sub b/usr.bin/ssh/config.sub
deleted file mode 100644
index 567459eb1f5..00000000000
--- a/usr.bin/ssh/config.sub
+++ /dev/null
@@ -1,1238 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-if [ x$1 = x ]
-then
-	echo Configuration name missing. 1>&2
-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-	echo "or     $0 ALIAS" 1>&2
-	echo where ALIAS is a recognized configuration type. 1>&2
-	exit 1
-fi
-
-# First pass through any local machine types.
-case $1 in
-	*local*)
-		echo $1
-		exit 0
-		;;
-	*)
-	;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  linux-gnu*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond )	# EGCS LOCAL
-		os=
-		basic_machine=$1
-		;;
-	-scout)						# EGCS LOCAL
-		;;
-	-wrs)						# EGCS LOCAL
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-		| arme[lb] | pyramid | mn10200 | mn10300 \
-		| tron | a29k | 580 | i960 | h8300 \
-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
-		| 1750a | dsp16xx | pdp11 \
-		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-		| mipstx39 | mipstx39el \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x)
-		basic_machine=$basic_machine-unknown
-		;;
-	m88110 | m680[012346]0 | m683?2 | m68360 | m5200 | z8k | v70 \
-	        | h8500 | w65) # EGCS LOCAL
-		;;
-	thumb)
-		basic_machine=$basic_machine-unknown
-		;;
-	mips64vr4300 | mips64vr4300el) # EGCS LOCAL jsmith/vr4300
-		basic_machine=$basic_machine-unknown
-		;;
-	mips64vr4100 | mips64vr4100el) # EGCS LOCAL jsmith/vr4100
-		basic_machine=$basic_machine-unknown
-		;;
-	mips64vr5000 | mips64vr5000el) # EGCS LOCAL ian/vr5000
-		basic_machine=$basic_machine-unknown
-		;;
-	mips16)
-		basic_machine=$basic_machine-unknown
-		;;
-	d10v)
-		basic_machine=$basic_machine-unknown
-		;;
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i[34567]86)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
-	      | xmp-* | ymp-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* \
-	      | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
-	      | alpha-* | alphaev5-* | alphaev56-* | alphapca56-* \
-	      | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
-	      | xps100-* | clipper-* | orion-* \
-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-*  \
-	      | mipstx39-* | mipstx39el-* \
-	      | f301-* | arm*-*)
-		;;
-	m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-* | d10v-*) # EGCS LOCAL
-		;;
-	thumb-*) # EGCS LOCAL angela/thumb
-		;;
-	v850-*) # EGCS LOCAL
-	        ;;
-	d30v-*) # EGCS LOCAL
-	        ;;
-	mips64vr4300-* | mips64vr4300el-*) # EGCS LOCAL jsmith/vr4300
-		;;
-	mips64vr4100-* | mips64vr4100el-*) # EGCS LOCAL jsmith/vr4100
-		;;
-	mips16-*) # EGCS LOCAL krk/mips16
-		;;
-	tic30-*) # EGCS LOCAL ian/tic30
-		;;
-	c30-*) # EGCS LOCAL ian/tic30
-		basic_machine=tic30-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)						# EGCS LOCAL
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)					# EGCS LOCAL
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)					# EGCS LOCAL
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-cbm
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-cbm
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-cbm
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)					# EGCS LOCAL
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[ctj]90-cray)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)		# EGCS LOCAL
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)					# EGCS LOCAL
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)					# EGCS LOCAL
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-        w89k-*)						# EGCS LOCAL
-                basic_machine=hppa1.1-winbond
-                os=-proelf
-                ;;
-        op50n-*)					# EGCS LOCAL
-                basic_machine=hppa1.1-oki
-                os=-proelf
-                ;;
-        op60c-*)					# EGCS LOCAL
-                basic_machine=hppa1.1-oki
-                os=-proelf
-                ;;
-        hppro)						# EGCS LOCAL
-                basic_machine=hppa1.1-hp
-                os=-proelf
-                ;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9] )
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9] )
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9] )
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | \
-	hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893 )
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679] )
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)					# EGCS LOCAL
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i[34567]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i[34567]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i[34567]86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)					# EGCS LOCAL
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)				# EGCS LOCAL
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	i386-go32 | go32)				# EGCS LOCAL
-		basic_machine=i386-unknown
-		os=-go32
-		;;
-	i386-mingw32 | mingw32)
-		basic_machine=i386-unknown
-		os=-mingw32
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)					# EGCS LOCAL
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	msdos)						# EGCS LOCAL
-		basic_machine=i386-unknown	
-		os=-msdos
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown		# EGCS LOCAL
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-corel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)						# EGCS LOCAL
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)						# EGCS LOCAL
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	OSE68000 | ose68000)				# EGCS LOCAL
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)						# EGCS LOCAL
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexen)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=rs6000-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	rom68k)						# EGCS LOCAL
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	sa29200)					# EGCS LOCAL
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-wrs)					# EGCS LOCAL
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)						# EGCS LOCAL
-		basic_machine=m68k-tandem
-		;;
-	stratus)					# EGCS LOCAL
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)					# EGCS LOCAL
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)						# EGCS LOCAL
- 		basic_machine=w65-wdc
- 		os=-none
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	z8k-*-coff)					# EGCS LOCAL
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)						# EGCS LOCAL
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)						# EGCS LOCAL
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)						# EGCS LOCAL
-		basic_machine=hppa1.1-oki
-		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sparc | sparcv9)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)				# EGCS LOCAL
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)				# EGCS LOCAL
-		basic_machine=powerpc-apple
-		;;
- 	c4x*)
- 		basic_machine=c4x-none
- 		os=-coff
-  		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* )
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	# EGCS LOCAL
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug |  -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews* )
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	# END EGCS LOCAL
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-386bsd)					# EGCS LOCAL
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)						# EGCS LOCAL
-		os=-ose
-		;;
-	-es1800*)					# EGCS LOCAL
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-corel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)					# EGCS LOCAL
-		os=-aout
-		;;
-	mips*-cisco)					# EGCS LOCAL
-		os=-elf
-		;;
-        mips*-*)                                        # EGCS LOCAL
-                os=-elf
-                ;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)						# EGCS LOCAL
-		os=-proelf
-		;;
-	*-winbond)					# EGCS LOCAL
-		os=-proelf
-		;;
-	*-oki)						# EGCS LOCAL
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f301-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)					# EGCS LOCAL
-		os=-coff
-		;;
-	*-*bug)						# EGCS LOCAL
-		os=-coff
-		;;
-	*-apple)					# EGCS LOCAL
-		os=-macos
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)				# EGCS LOCAL
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)		# EGCS LOCAL
-				vendor=apple
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
diff --git a/usr.bin/ssh/configure b/usr.bin/ssh/configure
deleted file mode 100644
index 62007c509de..00000000000
--- a/usr.bin/ssh/configure
+++ /dev/null
@@ -1,5293 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-warnings       Enable -Wall if using gcc."
-ac_help="$ac_help
-  --with-gmp[=PATH]      Where to find GMP library."
-ac_help="$ac_help
-  --with-idea             Use IDEA (not default).
-  --without-idea          Don't use IDEA: avoids patent problems in commercial use"
-ac_help="$ac_help
-  --with-rc4          Include RC4 support.
-  --without-rc4       Don't include RC4 support (default)"
-ac_help="$ac_help
-  --with-blowfish          Include Blowfish support (default).
-  --without-blowfish       Don't include Blowfish support"
-ac_help="$ac_help
-  --with-rsaref           Use RSAREF (try to avoid patent problems in U.S.)
-  --without-rsaref        Use normal RSA routines (default). "
-ac_help="$ac_help
-  --with-ssl           Use SSL (try to avoid patent problems in U.S.)
-  --without-ssl         Use normal RSA routines (default). "
-ac_help="$ac_help
-  --with-rsh=PATH         Specify where to find rsh.
-  --without-rsh           Do not use rsh under any conditions. "
-ac_help="$ac_help
-  --with-path=PATH        Default path passed to user shell by sshd."
-ac_help="$ac_help
-  --with-etcdir=PATH      Directory containing ssh system files (default /etc)."
-ac_help="$ac_help
-  --with-securid[=PATH]   Enable support for Security Dynamics SecurID card."
-ac_help="$ac_help
-  --with-zlib            Use zlib (default).
-  --without-zlib          Don't use zlib."
-ac_help="$ac_help
-  --with-krb4[=PATH]      Compile in Kerberos v4 support."
-ac_help="$ac_help
-  --with-afs              Compile in AFS support (requires KTH krb4)."
-ac_help="$ac_help
-  --with-libwrap[=PATH]   Compile in libwrap (tcp_wrappers) support."
-ac_help="$ac_help
-  --with-socks[=PATH]     Compile with SOCKS firewall traversal support."
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=sshd.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:593: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:617: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:647: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:698: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:730: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 741 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:777: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:805: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:837: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 852 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 869 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 886 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-
-case "$host" in
-  *-*-sunos4.1.1*)
-    os_sunos=yes
-    # Tim Adam <tma@osa.com.au> says speed_t is defined in stdtypes.h
-    cat >> confdefs.h <<\EOF
-#define SPEED_T_IN_STDTYPES_H 1
-EOF
-
-    ;;
-  *-*-sunos*)
-    os_sunos=yes
-    ;;
-  *-sgi-irix5*)
-    # Irix stuff from snabb@niksula.hut.fi and tsurmacz@asic.ict.pwr.wroc.pl.
-    no_libsocket=yes
-    no_libsun=yes
-    ;;
-  *-sgi-irix6*)
-    # from d-champion@uchicago.edu
-    no_libsocket=yes
-    no_libsun=yes
-    if test "`uname -s`" = "IRIX64"; then
-      CFLAGS="-32 $CFLAGS"
-      LDFLAGS="-32 $LDFLAGS"
-    fi
-    ;;
-  *-ibm-aix3.2|*-ibm-aix3.2.0|*-ibm-aix3.2.1|*-ibm-aix3.2.2|*-ibm-aix3.2.3|*-ibm-aix3.2.4)
-    os_aix=yes
-    echo $ac_n "checking for getuserattr in -ls""... $ac_c" 1>&6
-echo "configure:946: checking for getuserattr in -ls" >&5
-ac_lib_var=`echo s'_'getuserattr | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ls  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 954 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getuserattr();
-
-int main() {
-getuserattr()
-; return 0; }
-EOF
-if { (eval echo configure:965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo s | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-ls $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    ;;
-  *-ibm-aix*)
-    os_aix=yes
-    echo $ac_n "checking for getuserattr in -ls""... $ac_c" 1>&6
-echo "configure:996: checking for getuserattr in -ls" >&5
-ac_lib_var=`echo s'_'getuserattr | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ls  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1004 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getuserattr();
-
-int main() {
-getuserattr()
-; return 0; }
-EOF
-if { (eval echo configure:1015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo s | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-ls $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    ;;
-  mips-dec-mach3*)
-    # Mach3 stuff from kivinen@hut.fi
-    no_vhangup=yes
-    ;;
-  *-dec-ultrix*)
-    # Ultrix stuff from dmckilli@qc.bell.ca, jbotz@orixa.mtholyoke.edu.
-    cat >> confdefs.h <<\EOF
-#define O_NONBLOCK_BROKEN 1
-EOF
-
-    no_vhangup=yes
-    cat > conftest.$ac_ext <<EOF
-#line 1055 "configure"
-#include "confdefs.h"
-#include <syslog.h>
-int main() {
-int foo = LOG_DAEMON; 
-; return 0; }
-EOF
-if { (eval echo configure:1062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define NEED_SYS_SYSLOG_H 1
-EOF
-
-fi
-rm -f conftest*
-    ;;
-  *-*-hpux*)
-    # HPUX flags from jgotts@engin.umich.edu
-    if test -z "$GCC"; then
-      CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
-    fi
-    cat >> confdefs.h <<\EOF
-#define HPSUX_NONSTANDARD_X11_KLUDGE 1
-EOF
-
-    ;;
-  alpha-dec-osf*)
-    cat >> confdefs.h <<\EOF
-#define TTY_GROUP "terminal"
-EOF
-
-    echo $ac_n "checking for set_auth_parameters in -lsecurity""... $ac_c" 1>&6
-echo "configure:1091: checking for set_auth_parameters in -lsecurity" >&5
-ac_lib_var=`echo security'_'set_auth_parameters | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsecurity  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1099 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char set_auth_parameters();
-
-int main() {
-set_auth_parameters()
-; return 0; }
-EOF
-if { (eval echo configure:1110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo security | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lsecurity $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    echo $ac_n "checking for OSF/1 C2 security package""... $ac_c" 1>&6
-echo "configure:1138: checking for OSF/1 C2 security package" >&5
-    osfc2sec=`/usr/sbin/setld -i | grep '^OSFC2SEC'`
-    if test -n "$osfc2sec"; then
-      echo "$ac_t""yes" 1>&6
-      cat >> confdefs.h <<\EOF
-#define HAVE_OSF1_C2_SECURITY 1
-EOF
-
-      echo $ac_n "checking for set_auth_parameters in -lsecurity""... $ac_c" 1>&6
-echo "configure:1147: checking for set_auth_parameters in -lsecurity" >&5
-ac_lib_var=`echo security'_'set_auth_parameters | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsecurity  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1155 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char set_auth_parameters();
-
-int main() {
-set_auth_parameters()
-; return 0; }
-EOF
-if { (eval echo configure:1166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -lsecurity"
-else
-  echo "$ac_t""no" 1>&6
-{ echo "configure: error: "Could not find libsecurity even though C2 security installed."" 1>&2; exit 1; }
-fi
-
-      CONFOBJS="$CONFOBJS osfc2.o"
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-    ;;
-  *-*-nextstep*)
-    # Nextstep support from a person who wants to remain anonymous
-    no_termios=yes
-    cat >> confdefs.h <<\EOF
-#define SPEED_T_IN_STDTYPES_H 1
-EOF
-
-    ;;
-  *-*-linux*)
-    # Linux shadow password support (Andrew.Macpherson.1248566@bnr.co.uk)
-    if test -f /etc/shadow && test -f /etc/login.defs; then
-      echo "$ac_t""Using linux John Haugh shadow passwords and pw_encrypt for password encryption" 1>&6
-      cat >> confdefs.h <<\EOF
-#define crypt pw_encrypt
-EOF
-
-      LIBS="$LIBS -lshadow"
-    fi
-    ;;
-  i*86-*-bsdi*)
-    no_pipe=yes
-    ;;
-  i*86-unknown-bsd*)
-    # Assume 386BSD.  pgut01@cs.auckland.ac.nz reported this makes it compile.
-    cat >> confdefs.h <<\EOF
-#define __FreeBSD__ 1
-EOF
-
-    ;;
-  m68k-sony-newsos*)
-    # From snabb@niksula.hut.fi
-    no_vhangup=yes
-    ;;
-  m88k-dg-dgux*)
-    cat >> confdefs.h <<\EOF
-#define BROKEN_INET_ADDR 1
-EOF
-
-    ;;
-  *-cray-unicos*)
-    CFLAGS="$CFLAGS -DCRAY_STACKSEG_END=_getb67"
-    ;;
-  *-*-sysv4*)
-    echo $ac_n "checking for openlog in -lgen""... $ac_c" 1>&6
-echo "configure:1236: checking for openlog in -lgen" >&5
-ac_lib_var=`echo gen'_'openlog | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lgen  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1244 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char openlog();
-
-int main() {
-openlog()
-; return 0; }
-EOF
-if { (eval echo configure:1255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo gen | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lgen $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    ;;
-  *-*-machten*)
-    cat >> confdefs.h <<\EOF
-#define USE_STRLEN_FOR_AF_UNIX 1
-EOF
-
-    ;;
-  i*86-unknown-sco*)
-    # From moi@dio.com
-    cat >> confdefs.h <<\EOF
-#define HAVE_SCO_ETC_SHADOW 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define SCO 1
-EOF
-
-    no_ranlib=yes
-    LIBS="-L/usr/lib/libp -lprot -lx $LIBS"
-    ;;
-  *-convex-bsd*)
-    # From mark.martinec@nsc.ijs.si
-    # On Convex, getpwnam sets pw_passwd if running as root
-    no_shadows_password_checking=yes
-    ;;
-  *-*-freebsd*)
-    # From Ollivier Robert: FreeBSD and NetBSD use master.passwd, but set
-    # pw_passwd automatically when running as root.
-    no_shadow_password_checking=yes
-    ;;
-  *-*-netbsd*)
-    # From Ollivier Robert: FreeBSD and NetBSD use master.passwd, but set
-    # pw_passwd automatically when running as root.
-    no_shadow_password_checking=yes
-    ;;
-  *-*-openbsd*)
-    no_shadow_password_checking=yes
-    ;;
-  *)
-    ;;
-esac
-
-# Socket pairs appear to be broken on several systems.  I don't know exactly
-# where, so I'll use pipes everywhere for now.
-cat >> confdefs.h <<\EOF
-#define USE_PIPES 1
-EOF
-
-
-echo $ac_n "checking that the compiler works""... $ac_c" 1>&6
-echo "configure:1332: checking that the compiler works" >&5
-if test "$cross_compiling" = yes; then
-  { echo "configure: error: Could not compile and run even a trivial ANSI C program - check CC." 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1337 "configure"
-#include "confdefs.h"
- main(int ac, char **av) { return 0; } 
-EOF
-if { (eval echo configure:1341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  echo "$ac_t""no" 1>&6
-    { echo "configure: error: Could not compile and run even a trivial ANSI C program - check CC." 1>&2; exit 1; }
-fi
-rm -fr conftest*
-fi
-
-
-if test -z "$no_pipe"; then
-if test -n "$GCC"; then
-  echo $ac_n "checking if the compiler understands -pipe""... $ac_c" 1>&6
-echo "configure:1358: checking if the compiler understands -pipe" >&5
-  OLDCC="$CC"
-  CC="$CC -pipe"
-  cat > conftest.$ac_ext <<EOF
-#line 1362 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:1369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CC="$OLDCC"
-    echo "$ac_t""no" 1>&6
-fi
-rm -f conftest*
-fi
-fi
-
-# Check whether --enable-warnings or --disable-warnings was given.
-if test "${enable_warnings+set}" = set; then
-  enableval="$enable_warnings"
-   if test -n "$GCC"; then 
-    echo "$ac_t""Adding -Wall to CFLAGS." 1>&6
-    CFLAGS="$CFLAGS -Wall"
-  fi
-fi
-
-
-if test -z "$no_vhangup"; then
-  for ac_func in vhangup
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1397: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1402 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-fi
-
-if test -z "$no_setsid"; then
-  for ac_func in setsid
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1455: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1460 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-fi
-
-echo $ac_n "checking where to find mandatory GMP library""... $ac_c" 1>&6
-echo "configure:1510: checking where to find mandatory GMP library" >&5
-# Check whether --with-gmp or --without-gmp was given.
-if test "${with_gmp+set}" = set; then
-  withval="$with_gmp"
-   case "$withval" in
-  no)
-    echo "GMP is mandatory! Aborting!"
-    exit 1
-    ;;
-  *)
-    ;;
-  esac 
-else
-   with_gmp=yes 
-
-fi
-
-# gmp continued
-echo argument="$with_gmp"
-case "$with_gmp" in
-yes)
-  for ac_hdr in gmp.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1535: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1540 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-  if test "$ac_cv_header_gmp_h" != yes; then
-    echo "Can't find include file gmp.h! Aborting!"
-    echo "You must first build and install GMP, please read the file INSTALL"
-    exit 1
-  fi
-  echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6
-echo "configure:1577: checking for main in -lgmp" >&5
-ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lgmp  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1585 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:1592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo gmp | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lgmp $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test "$ac_cv_lib_gmp_main" != yes; then
-    echo "Can't find library gmp (libgmp.a)! Aborting"
-    echo "You must first build and install GMP, please read the file INSTALL"
-    exit 1
-  fi
-  GMPINCS=""
-  GMPLIBS="-lgmp"
-  ;;
-*)
-  GMPINCS="-I$with_gmp/include"
-  GMPLIBS="-L$with_gmp/lib -lgmp"
-  ;;
-esac
-  
-for ac_func in _getpty clock fchmod getdtablesize gethostname getrusage
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1636: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1641 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in gettimeofday initgroups innetgr memcpy openpty popen seteuid
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1691: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1696 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in setlogin setluid setrlimit strchr times ulimit umask vsnprintf
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1746: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1751 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:1800: checking return type of signal handlers" >&5
-if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1805 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <signal.h>
-#ifdef signal
-#undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
-
-int main() {
-int i;
-; return 0; }
-EOF
-if { (eval echo configure:1822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_type_signal=void
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_type_signal=int
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_type_signal" 1>&6
-cat >> confdefs.h <<EOF
-#define RETSIGTYPE $ac_cv_type_signal
-EOF
-
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1841: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1846 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ac_cv_header_stdc=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 1871 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 1889 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1910 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-if { (eval echo configure:1921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1945: checking for size_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1950 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_size_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_size_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&6
-if test $ac_cv_type_size_t = no; then
-  cat >> confdefs.h <<\EOF
-#define size_t unsigned
-EOF
-
-fi
-
-echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:1978: checking for uid_t in sys/types.h" >&5
-if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1983 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "uid_t" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_uid_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_uid_t=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_type_uid_t" 1>&6
-if test $ac_cv_type_uid_t = no; then
-  cat >> confdefs.h <<\EOF
-#define uid_t int
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define gid_t int
-EOF
-
-fi
-
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2012: checking for off_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2017 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_off_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_off_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_off_t" 1>&6
-if test $ac_cv_type_off_t = no; then
-  cat >> confdefs.h <<\EOF
-#define off_t long
-EOF
-
-fi
-
-echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:2045: checking for mode_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2050 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_mode_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_mode_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_mode_t" 1>&6
-if test $ac_cv_type_mode_t = no; then
-  cat >> confdefs.h <<\EOF
-#define mode_t int
-EOF
-
-fi
-
-echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:2078: checking for st_blksize in struct stat" >&5
-if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2083 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-int main() {
-struct stat s; s.st_blksize;
-; return 0; }
-EOF
-if { (eval echo configure:2091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_struct_st_blksize=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_struct_st_blksize=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_struct_st_blksize" 1>&6
-if test $ac_cv_struct_st_blksize = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ST_BLKSIZE 1
-EOF
-
-fi
-
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2113: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2118 "configure"
-#include "confdefs.h"
-
-int main() {
-
-/* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this.  */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this.  */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
-   It does not let you subtract one const X* pointer from another in an arm
-   of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this.  */
-  char *t;
-  char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-  *t++ = 0;
-}
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-  int x[] = {25, 17};
-  const int *foo = &x[0];
-  ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-  typedef const int *iptr;
-  iptr p = 0;
-  ++p;
-}
-{ /* AIX XL C 1.02.0.0 rejects this saying
-     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-  struct s { int j; const int *ap[3]; };
-  struct s *b; b->j = 5;
-}
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-  const int foo = 10;
-}
-
-; return 0; }
-EOF
-if { (eval echo configure:2167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_const=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_const=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_c_const" 1>&6
-if test $ac_cv_c_const = no; then
-  cat >> confdefs.h <<\EOF
-#define const 
-EOF
-
-fi
-
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2188: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat > conftest.$ac_ext <<EOF
-#line 2195 "configure"
-#include "confdefs.h"
-
-int main() {
-} $ac_kw foo() {
-; return 0; }
-EOF
-if { (eval echo configure:2202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-
-fi
-
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
-  inline | yes) ;;
-  no) cat >> confdefs.h <<\EOF
-#define inline 
-EOF
- ;;
-  *)  cat >> confdefs.h <<EOF
-#define inline $ac_cv_c_inline
-EOF
- ;;
-esac
-
-echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:2228: checking whether byte ordering is bigendian" >&5
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
-cat > conftest.$ac_ext <<EOF
-#line 2235 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
-
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:2246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat > conftest.$ac_ext <<EOF
-#line 2250 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
-
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:2261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_bigendian=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_bigendian=no
-fi
-rm -f conftest*
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-if test $ac_cv_c_bigendian = unknown; then
-if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2281 "configure"
-#include "confdefs.h"
-main () {
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
-EOF
-if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_bigendian=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_bigendian=yes
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_c_bigendian" 1>&6
-if test $ac_cv_c_bigendian = yes; then
-  cat >> confdefs.h <<\EOF
-#define WORDS_BIGENDIAN 1
-EOF
-
-fi
-
-echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:2318: checking size of long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2326 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long));
-  exit(0);
-}
-EOF
-if { (eval echo configure:2337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_long" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-EOF
-
-
-echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:2357: checking size of int" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2365 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(int));
-  exit(0);
-}
-EOF
-if { (eval echo configure:2376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_int=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_int=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-EOF
-
-
-echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:2396: checking size of short" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2404 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(short));
-  exit(0);
-}
-EOF
-if { (eval echo configure:2415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_short=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_short=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_short" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-EOF
-
-
-
-if test -z "$no_termios"; then
-  for ac_hdr in termios.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2440: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2445 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-fi
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2479: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2484 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ac_cv_header_stdc=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 2509 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 2527 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2548 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-if { (eval echo configure:2559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2583: checking for sys/wait.h that is POSIX.1 compatible" >&5
-if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2588 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/wait.h>
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-#endif
-#ifndef WIFEXITED
-#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif
-int main() {
-int s;
-wait (&s);
-s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-; return 0; }
-EOF
-if { (eval echo configure:2604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_header_sys_wait_h=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_sys_wait_h=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
-if test $ac_cv_header_sys_wait_h = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_SYS_WAIT_H 1
-EOF
-
-fi
-
-for ac_hdr in unistd.h rusage.h sys/time.h lastlog.h utmp.h utmpx.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2628: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2633 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in sgtty.h sys/select.h sys/ioctl.h sys/filio.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2673 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in paths.h usersec.h utime.h netinet/in_systm.h ulimit.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2708: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2713 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2745: checking whether time.h and sys/time.h may both be included" >&5
-if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2750 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-int main() {
-struct tm *tp;
-; return 0; }
-EOF
-if { (eval echo configure:2759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_header_time=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_time=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_time" 1>&6
-if test $ac_cv_header_time = yes; then
-  cat >> confdefs.h <<\EOF
-#define TIME_WITH_SYS_TIME 1
-EOF
-
-fi
-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:2784: checking for $ac_hdr that defines DIR" >&5
-if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2789 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <$ac_hdr>
-int main() {
-DIR *dirp = 0;
-; return 0; }
-EOF
-if { (eval echo configure:2797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_header_dirent_$ac_safe=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_dirent_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- ac_header_dirent=$ac_hdr; break
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
-echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:2822: checking for opendir in -ldir" >&5
-ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldir  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2830 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char opendir();
-
-int main() {
-opendir()
-; return 0; }
-EOF
-if { (eval echo configure:2841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -ldir"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:2863: checking for opendir in -lx" >&5
-ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lx  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2871 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char opendir();
-
-int main() {
-opendir()
-; return 0; }
-EOF
-if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -lx"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:2905: checking whether stat file-mode macros are broken" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2910 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined(S_ISBLK) && defined(S_IFDIR)
-# if S_ISBLK (S_IFDIR)
-You lose.
-# endif
-#endif
-
-#if defined(S_ISBLK) && defined(S_IFCHR)
-# if S_ISBLK (S_IFCHR)
-You lose.
-# endif
-#endif
-
-#if defined(S_ISLNK) && defined(S_IFREG)
-# if S_ISLNK (S_IFREG)
-You lose.
-# endif
-#endif
-
-#if defined(S_ISSOCK) && defined(S_IFREG)
-# if S_ISSOCK (S_IFREG)
-You lose.
-# endif
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "You lose" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_header_stat_broken=yes
-else
-  rm -rf conftest*
-  ac_cv_header_stat_broken=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_header_stat_broken" 1>&6
-if test $ac_cv_header_stat_broken = yes; then
-  cat >> confdefs.h <<\EOF
-#define STAT_MACROS_BROKEN 1
-EOF
-
-fi
-
-cat > conftest.$ac_ext <<EOF
-#line 2961 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_pid" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_PID_IN_UTMP 1
-EOF
-
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 2976 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_name" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_NAME_IN_UTMP 1
-EOF
-
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 2991 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_id" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_ID_IN_UTMP 1
-EOF
-
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 3006 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_host" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_HOST_IN_UTMP 1
-EOF
-
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 3021 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_addr" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_ADDR_IN_UTMP 1
-EOF
-
-fi
-rm -f conftest*
-
-
-cat > conftest.$ac_ext <<EOF
-#line 3037 "configure"
-#include "confdefs.h"
-#include <utmpx.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_session" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_UT_SESSION 1
-EOF
-
-fi
-rm -f conftest*
-
-cat > conftest.$ac_ext <<EOF
-#line 3052 "configure"
-#include "confdefs.h"
-#include <utmpx.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "ut_syslen" >/dev/null 2>&1; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define HAVE_UT_SYSLEN 1
-EOF
-
-fi
-rm -f conftest*
-
-
-echo $ac_n "checking for crypt in -lc""... $ac_c" 1>&6
-echo "configure:3068: checking for crypt in -lc" >&5
-ac_lib_var=`echo c'_'crypt | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3076 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char crypt();
-
-int main() {
-crypt()
-; return 0; }
-EOF
-if { (eval echo configure:3087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  true
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:3106: checking for crypt in -lcrypt" >&5
-ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcrypt  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3114 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char crypt();
-
-int main() {
-crypt()
-; return 0; }
-EOF
-if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo crypt | sed -e 's/^a-zA-Z0-9_/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lcrypt $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:3155: checking for main in -lnsl" >&5
-ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lnsl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3163 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:3170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lnsl $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$no_libsocket"; then
-  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3199: checking for socket in -lsocket" >&5
-ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsocket  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3207 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char socket();
-
-int main() {
-socket()
-; return 0; }
-EOF
-if { (eval echo configure:3218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lsocket $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$no_libsun"; then
-  echo $ac_n "checking for getpwnam in -lsun""... $ac_c" 1>&6
-echo "configure:3248: checking for getpwnam in -lsun" >&5
-ac_lib_var=`echo sun'_'getpwnam | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsun  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3256 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char getpwnam();
-
-int main() {
-getpwnam()
-; return 0; }
-EOF
-if { (eval echo configure:3267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo sun | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lsun $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-echo $ac_n "checking for login in -lutil""... $ac_c" 1>&6
-echo "configure:3296: checking for login in -lutil" >&5
-ac_lib_var=`echo util'_'login | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lutil  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3304 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char login();
-
-int main() {
-login()
-; return 0; }
-EOF
-if { (eval echo configure:3315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_LIBUTIL_LOGIN 1
-EOF
-
-			  LIBS="$LIBS -lutil"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking for main in -ldes""... $ac_c" 1>&6
-echo "configure:3341: checking for main in -ldes" >&5
-ac_lib_var=`echo des'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldes  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3349 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:3356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo des | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-ldes $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-for ac_func in strerror memmove remove random putenv socketpair
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3387: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3392 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
-fi
-done
-
-
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:3443: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3475: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-if test -z "$no_ranlib"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3531: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-for ac_prog in makedepend makedep
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3566: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_MAKEDEP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$MAKEDEP"; then
-  ac_cv_prog_MAKEDEP="$MAKEDEP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_MAKEDEP="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-MAKEDEP="$ac_cv_prog_MAKEDEP"
-if test -n "$MAKEDEP"; then
-  echo "$ac_t""$MAKEDEP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$MAKEDEP" && break
-done
-test -n "$MAKEDEP" || MAKEDEP="makedepend"
-
-for ac_prog in wish8.0 wish wishx wish4.1 true
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3601: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_WISH'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$WISH" in
-  /*)
-  ac_cv_path_WISH="$WISH" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_WISH="$WISH" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_WISH="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-WISH="$ac_cv_path_WISH"
-if test -n "$WISH"; then
-  echo "$ac_t""$WISH" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$WISH" && break
-done
-
-if test `basename $WISH` = "true"; then
-  echo "configure: warning: the wish program was not found - ssh-askpass will not work." 1>&2
-  WISH="/usr/local/bin/wish"
-fi
-# Extract the first word of "xauth", so it can be a program name with args.
-set dummy xauth; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3643: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XAUTH_PATH'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$XAUTH_PATH" in
-  /*)
-  ac_cv_path_XAUTH_PATH="$XAUTH_PATH" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_XAUTH_PATH="$XAUTH_PATH" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH:/usr/X11R6/bin"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_XAUTH_PATH="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-XAUTH_PATH="$ac_cv_path_XAUTH_PATH"
-if test -n "$XAUTH_PATH"; then
-  echo "$ac_t""$XAUTH_PATH" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -n "$XAUTH_PATH"; then
-  cat >> confdefs.h <<EOF
-#define XAUTH_PATH "$XAUTH_PATH"
-EOF
-
-fi
-
-echo $ac_n "checking for pseudo ttys""... $ac_c" 1>&6
-echo "configure:3683: checking for pseudo ttys" >&5
-if test -c /dev/ptmx && test -c /dev/pts/0
-then
-  cat >> confdefs.h <<\EOF
-#define HAVE_DEV_PTMX 1
-EOF
-
-  echo "$ac_t""streams ptys" 1>&6
-else
-if test -c /dev/pts && test -c /dev/ptc
-then
-  cat >> confdefs.h <<\EOF
-#define HAVE_DEV_PTS_AND_PTC 1
-EOF
-
-  echo "$ac_t""/dev/pts and /dev/ptc" 1>&6
-else
-  echo "$ac_t""bsd-style ptys" 1>&6
-fi
-fi
-
-echo $ac_n "checking for /etc/default/login""... $ac_c" 1>&6
-echo "configure:3705: checking for /etc/default/login" >&5
-if test -f /etc/default/login; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ETC_DEFAULT_LOGIN 1
-EOF
-
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$no_shadows_password_checking"; then
-  echo $ac_n "checking for shadow passwords""... $ac_c" 1>&6
-echo "configure:3718: checking for shadow passwords" >&5
-  if test -f /etc/shadow; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_ETC_SHADOW 1
-EOF
-
-    echo "$ac_t""/etc/shadow" 1>&6
-  elif test -n "$os_aix"; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_ETC_SECURITY_PASSWD 1
-EOF
-
-    echo "$ac_t""/etc/security/passwd" 1>&6
-  elif test -n "$os_sunos"; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_ETC_SECURITY_PASSWD_ADJUNCT 1
-EOF
-
-    echo "$ac_t""/etc/security/passwd.adjunct" 1>&6
-  else
-    echo "$ac_t""no" 1>&6
-  fi
-fi
-
-echo $ac_n "checking location of mail spool files""... $ac_c" 1>&6
-echo "configure:3743: checking location of mail spool files" >&5
-for dir in /var/spool/mail /var/mail /usr/spool/mail /usr/mail NEWMAIL
-do
-  if test "$dir" = "NEWMAIL"; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_TILDE_NEWMAIL 1
-EOF
-
-    echo "$ac_t""\$HOME/newmail" 1>&6
-    echo "configure: warning: mail spool directory was not found: assuming you use \$HOME/newmail" 1>&2
-  elif test -d $dir; then
-    cat >> confdefs.h <<EOF
-#define MAIL_SPOOL_DIRECTORY "$dir"
-EOF
-
-    echo "$ac_t""$dir" 1>&6
-    break
-  fi
-done
-
-echo $ac_n "checking location of utmp""... $ac_c" 1>&6
-echo "configure:3764: checking location of utmp" >&5
-if test -f /var/run/utmp; then
-  cat >> confdefs.h <<\EOF
-#define SSH_UTMP "/var/run/utmp"
-EOF
-
-  echo "$ac_t""/var/run/utmp" 1>&6
-elif test -f /var/log/utmp; then
-  cat >> confdefs.h <<\EOF
-#define SSH_UTMP "/var/log/utmp"
-EOF
-
-  echo "$ac_t""/var/log/utmp" 1>&6
-elif test -f /var/adm/utmp; then
-  cat >> confdefs.h <<\EOF
-#define SSH_UTMP "/var/adm/utmp"
-EOF
-
-  echo "$ac_t""/var/adm/utmp" 1>&6
-elif test -f /usr/adm/utmp; then
-  cat >> confdefs.h <<\EOF
-#define SSH_UTMP "/usr/adm/utmp"
-EOF
-
-  echo "$ac_t""/usr/adm/utmp" 1>&6
-elif test -f /etc/utmp; then
-  cat >> confdefs.h <<\EOF
-#define SSH_UTMP "/etc/utmp"
-EOF
-
-  echo "$ac_t""/etc/utmp" 1>&6
-else
-  echo "$ac_t""not found" 1>&6
-fi
-
-echo $ac_n "checking location of wtmp""... $ac_c" 1>&6
-echo "configure:3800: checking location of wtmp" >&5
-if test -f /var/log/wtmp; then
-  cat >> confdefs.h <<\EOF
-#define SSH_WTMP "/var/log/wtmp"
-EOF
-
-  echo "$ac_t""/var/log/wtmp" 1>&6
-elif test -f /var/adm/wtmp; then
-  cat >> confdefs.h <<\EOF
-#define SSH_WTMP "/var/adm/wtmp"
-EOF
-
-  echo "$ac_t""/var/adm/wtmp" 1>&6
-elif test -f /usr/adm/wtmp; then
-  cat >> confdefs.h <<\EOF
-#define SSH_WTMP "/usr/adm/wtmp"
-EOF
-
-  echo "$ac_t""/usr/adm/wtmp" 1>&6
-elif test -f /etc/wtmp; then
-  cat >> confdefs.h <<\EOF
-#define SSH_WTMP "/etc/wtmp"
-EOF
-
-  echo "$ac_t""/etc/wtmp" 1>&6
-else
-  cat >> confdefs.h <<\EOF
-#define SSH_WTMP "/var/adm/wtmp"
-EOF
-
-  echo "$ac_t""not found" 1>&6
-fi
-
-echo $ac_n "checking location of lastlog""... $ac_c" 1>&6
-echo "configure:3834: checking location of lastlog" >&5
-if test -f /var/log/lastlog || test -d /var/log/lastlog; then
-  cat >> confdefs.h <<\EOF
-#define SSH_LASTLOG "/var/log/lastlog"
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define HAVE_LASTLOG 1
-EOF
-
-  LASTLOG=/var/log/lastlog
-  echo "$ac_t""/var/log/lastlog" 1>&6
-elif test -f /var/adm/lastlog || test -d /var/adm/lastlog; then
-  cat >> confdefs.h <<\EOF
-#define SSH_LASTLOG "/var/adm/lastlog"
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define HAVE_LASTLOG 1
-EOF
-
-  LASTLOG=/var/adm/lastlog
-  echo "$ac_t""/var/adm/lastlog" 1>&6
-elif test -f /usr/adm/lastlog || test -d /usr/adm/lastlog; then
-  cat >> confdefs.h <<\EOF
-#define SSH_LASTLOG "/usr/adm/lastlog"
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define HAVE_LASTLOG 1
-EOF
-
-  LASTLOG=/usr/adm/lastlog
-  echo "$ac_t""/usr/adm/lastlog" 1>&6
-elif test -f /etc/lastlog || test -d /etc/lastlog; then
-  cat >> confdefs.h <<\EOF
-#define SSH_LASTLOG "/etc/lastlog"
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define HAVE_LASTLOG 1
-EOF
-
-  LASTLOG=/etc/lastlog
-  echo "$ac_t""/etc/lastlog" 1>&6
-else
-  echo "$ac_t""not found" 1>&6
-  cat >> confdefs.h <<\EOF
-#define SSH_LASTLOG "/var/log/lastlog"
-EOF
-
-  LASTLOG=/var/log/lastlog
-fi
-
-echo $ac_n "checking whether $LASTLOG is a directory""... $ac_c" 1>&6
-echo "configure:3889: checking whether $LASTLOG is a directory" >&5
-if test -d $LASTLOG
-then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define LASTLOG_IS_DIR 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking whether to include the IDEA encryption algorithm""... $ac_c" 1>&6
-echo "configure:3902: checking whether to include the IDEA encryption algorithm" >&5
-# Check whether --with-idea or --without-idea was given.
-if test "${with_idea+set}" = set; then
-  withval="$with_idea"
-   case "$withval" in
-  yes)
-    echo "$ac_t""yes" 1>&6
-    CONFOBJS="$CONFOBJS idea.o"
-    cat >> confdefs.h <<\EOF
-#define WITH_IDEA 1
-EOF
-
-    ;;
-  *)
-    echo "$ac_t""no" 1>&6
-    ;;
-  esac 
-else
-  echo "$ac_t""no" 1>&6
-
-fi
-
-
-echo $ac_n "checking whether to include the RC4 encryption algorithm""... $ac_c" 1>&6
-echo "configure:3926: checking whether to include the RC4 encryption algorithm" >&5
-# Check whether --with-rc4 or --without-rc4 was given.
-if test "${with_rc4+set}" = set; then
-  withval="$with_rc4"
-   case "$withval" in
-  yes)
-    echo "$ac_t""yes" 1>&6
-    CONFOBJS="$CONFOBJS rc4.o"
-    cat >> confdefs.h <<\EOF
-#define WITH_RC4 1
-EOF
-
-    ;;
-  *)
-    echo "$ac_t""no" 1>&6
-    ;;
-  esac 
-else
-  echo "$ac_t""no" 1>&6
-
-fi
-
-
-echo $ac_n "checking whether to include the Blowfish encryption algorithm""... $ac_c" 1>&6
-echo "configure:3950: checking whether to include the Blowfish encryption algorithm" >&5
-# Check whether --with-blowfish or --without-blowfish was given.
-if test "${with_blowfish+set}" = set; then
-  withval="$with_blowfish"
-   case "$withval" in
-  no)
-    ;;
-  *)
-    with_blowfish=yes
-    ;;
-  esac 
-else
-  with_blowfish=yes
-
-fi
-
-
-case "$with_blowfish" in
-yes)
-    cat >> confdefs.h <<\EOF
-#define WITH_BLOWFISH 1
-EOF
-
-    CONFOBJS="$CONFOBJS bf_skey.o bf_enc.o"
-    echo "$ac_t""yes" 1>&6
-    ;;
-no)
-    echo "$ac_t""no" 1>&6
-    ;;
-esac
-
-echo $ac_n "checking whether to use rsaref""... $ac_c" 1>&6
-echo "configure:3982: checking whether to use rsaref" >&5
-# Check whether --with-rsaref or --without-rsaref was given.
-if test "${with_rsaref+set}" = set; then
-  withval="$with_rsaref"
-   case "$withval" in
-  no)
-       echo "$ac_t""no" 1>&6
-       ;;
-  *)
-       echo "$ac_t""yes" 1>&6
-       cat >> confdefs.h <<\EOF
-#define RSAREF 1
-EOF
-
-       RSAREFDEP="rsaref2/source/librsaref.a"
-       LIBS="-lrsaref $LIBS"
-       LDFLAGS="-Lrsaref2/source $LDFLAGS"
-       ;;
-  esac 
-else
-  echo "$ac_t""no" 1>&6
-
-fi
-
-
-echo $ac_n "checking whether to use ssl""... $ac_c" 1>&6
-echo "configure:4008: checking whether to use ssl" >&5
-# Check whether --with-ssl or --without-ssl was given.
-if test "${with_ssl+set}" = set; then
-  withval="$with_ssl"
-   case "$withval" in
-  no)
-       echo "$ac_t""no" 1>&6
-       ;;
-  *)
-       echo "$ac_t""yes" 1>&6
-       cat >> confdefs.h <<\EOF
-#define DO_SSL 1
-EOF
-
-       LIBS="-lcrypto $LIBS"
-       ;;
-  esac 
-else
-  echo "$ac_t""no" 1>&6
-
-fi
-
-
-echo $ac_n "checking whether to use rsh""... $ac_c" 1>&6
-echo "configure:4032: checking whether to use rsh" >&5
-# Check whether --with-rsh or --without-rsh was given.
-if test "${with_rsh+set}" = set; then
-  withval="$with_rsh"
-   case "$withval" in
-    no) 
-        echo "$ac_t""no" 1>&6
-	;;
-    yes) 
-	 echo "$ac_t""yes" 1>&6
-	 for ac_prog in remsh rsh
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4047: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_RSH_PATH'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$RSH_PATH" in
-  /*)
-  ac_cv_path_RSH_PATH="$RSH_PATH" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_RSH_PATH="$RSH_PATH" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_RSH_PATH="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-RSH_PATH="$ac_cv_path_RSH_PATH"
-if test -n "$RSH_PATH"; then
-  echo "$ac_t""$RSH_PATH" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$RSH_PATH" && break
-done
-
-         cat >> confdefs.h <<EOF
-#define RSH_PATH "$RSH_PATH"
-EOF
-
-	;;
-    *) 
-       echo "$ac_t""$withval" 1>&6
-       cat >> confdefs.h <<EOF
-#define RSH_PATH "$withval"
-EOF
-
-       ;;
-  esac 
-else
-   echo "$ac_t""yes" 1>&6
-    for ac_prog in remsh rsh
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4102: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_RSH_PATH'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$RSH_PATH" in
-  /*)
-  ac_cv_path_RSH_PATH="$RSH_PATH" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_RSH_PATH="$RSH_PATH" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_RSH_PATH="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-RSH_PATH="$ac_cv_path_RSH_PATH"
-if test -n "$RSH_PATH"; then
-  echo "$ac_t""$RSH_PATH" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$RSH_PATH" && break
-done
-
-    cat >> confdefs.h <<EOF
-#define RSH_PATH "$RSH_PATH"
-EOF
- 
-
-fi
-
-
-# Code to permit setting default path for users (alden@math.ohio-state.edu)
-echo $ac_n "checking default path""... $ac_c" 1>&6
-echo "configure:4147: checking default path" >&5
-# Check whether --with-path or --without-path was given.
-if test "${with_path+set}" = set; then
-  withval="$with_path"
-   case "$withval" in
-  no)
-    echo "$ac_t""use system default" 1>&6
-    ;;
-  *)
-    echo "$ac_t""$withval" 1>&6
-    cat >> confdefs.h <<EOF
-#define DEFAULT_PATH "$withval"
-EOF
-
-    ;;
-  esac 
-else
-  echo "$ac_t""use system default" 1>&6
-
-fi
-
-
-echo $ac_n "checking etcdir""... $ac_c" 1>&6
-echo "configure:4170: checking etcdir" >&5
-# Check whether --with-etcdir or --without-etcdir was given.
-if test "${with_etcdir+set}" = set; then
-  withval="$with_etcdir"
-   case "$withval" in
-  no)
-    { echo "configure: error: Need ETCDIR." 1>&2; exit 1; }
-    ;;
-  yes)
-    ETCDIR="/etc"
-    echo "$ac_t""/etc" 1>&6
-    ;;
-  *)
-    ETCDIR="$withval"
-    echo "$ac_t""$withval" 1>&6
-    ;;
-  esac 
-else
-  ETCDIR="/etc"
-  echo "$ac_t""/etc" 1>&6
-
-fi
-
-
-echo $ac_n "checking whether to support SecurID""... $ac_c" 1>&6
-echo "configure:4195: checking whether to support SecurID" >&5
-# Check whether --with-securid or --without-securid was given.
-if test "${with_securid+set}" = set; then
-  withval="$with_securid"
-   case "$withval" in
-  no)
-    echo "$ac_t""no" 1>&6
-    ;;
-  yes)
-    echo "$ac_t""yes" 1>&6
-    if test '!' -f /usr/ace/sdiclient.a; then
-      { echo "configure: error: SecurID sdiclient.a not found in /usr/ace: you must supply the path." 1>&2; exit 1; }
-    fi
-    echo "$ac_t""yes" 1>&6
-    echo "$ac_t""Assuming SecurID headers and libraries are in /usr/ace." 1>&6
-    cat >> confdefs.h <<\EOF
-#define HAVE_SECURID 1
-EOF
-
-    CFLAGS="$CFLAGS -I/usr/ace"
-    LIBS="/usr/ace/sdiclient.a $LIBS"
-    ;;
-  *)
-    echo "$ac_t""yes" 1>&6
-    if test '!' -f $withval/sdiclient.a; then
-      { echo "configure: error: SecurID sdiclient.a not found in $withval: please supply the correct path." 1>&2; exit 1; }
-    fi
-    echo "$ac_t""Assuming SecurID headers and libraries are in $withval." 1>&6
-    cat >> confdefs.h <<\EOF
-#define HAVE_SECURID 1
-EOF
-
-    CFLAGS="$CFLAGS -I$withval"
-    LIBS="$withval/sdiclient.a $LIBS"
-    ;;
-  esac 
-else
-  echo "$ac_t""no" 1>&6
-
-fi
-
-
-echo $ac_n "checking whether to include compression support""... $ac_c" 1>&6
-echo "configure:4238: checking whether to include compression support" >&5
-# Check whether --with-zlib or --without-zlib was given.
-if test "${with_zlib+set}" = set; then
-  withval="$with_zlib"
-   case "$withval" in
-  no)
-    ;;
-  *)
-    with_zlib=yes
-    ;;
-  esac 
-else
-  with_zlib=yes
-
-fi
-
-
-case "$with_zlib" in
-yes)
-    echo "$ac_t""yes" 1>&6
-    for ac_hdr in zlib.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4262: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4267 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-    if test "$ac_cv_header_zlib_h" != yes; then
-      echo "Can't find zlib.h, disable with --without-zlib"
-      exit 1
-    fi
-    echo $ac_n "checking for main in -lz""... $ac_c" 1>&6
-echo "configure:4303: checking for main in -lz" >&5
-ac_lib_var=`echo z'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lz  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4311 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:4318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo z | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lz $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test "$ac_cv_lib_z_main" != yes; then
-      echo "Can't find library z (libz.a), disable with --without-zlib"
-      exit 1
-    fi
-    CONFOBJS="$CONFOBJS compress.o"
-    cat >> confdefs.h <<\EOF
-#define WITH_ZLIB 1
-EOF
-
-    ;;
-no)
-    echo "$ac_t""no" 1>&6
-    ;;
-esac
-
-echo $ac_n "checking whether to use Kerberos v4""... $ac_c" 1>&6
-echo "configure:4361: checking whether to use Kerberos v4" >&5
-# Check whether --with-krb4 or --without-krb4 was given.
-if test "${with_krb4+set}" = set; then
-  withval="$with_krb4"
-   case "$withval" in
-  yes)
-    ;;
-  no)
-    ;;
-  *)
-    ;;
-  esac 
-else
-   with_krb4=default 
-
-fi
-
-# krb4 continued
-case "$with_krb4" in
-no)
-  echo "$ac_t""no" 1>&6
-  ;;
-yes)
-  echo "$ac_t""yes" 1>&6
-  for ac_hdr in krb.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4389: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4394 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-  if test "$ac_cv_header_krb_h" != yes; then
-    echo "Can't find include file krb.h! Aborting!"
-    exit 1
-  fi
-  echo $ac_n "checking for main in -lkrb""... $ac_c" 1>&6
-echo "configure:4430: checking for main in -lkrb" >&5
-ac_lib_var=`echo krb'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lkrb  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4438 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:4445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo krb | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lkrb $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test "$ac_cv_lib_krb_main" != yes; then
-    echo "Can't find library krb (libkrb.a)! Aborting"
-    exit 1
-  fi
-  cat >> confdefs.h <<\EOF
-#define KRB4 1
-EOF
-
-  KRB4_AUTH="auth-krb4.o"
-  KRB4_ROOT=""
-  KRB4_INCS=""
-  KRB4_LIBS="-lkrb -ldes"
-  echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
-echo "configure:4485: checking for dn_expand in -lresolv" >&5
-ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lresolv  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4493 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dn_expand();
-
-int main() {
-dn_expand()
-; return 0; }
-EOF
-if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  KRB4_LIBS="$KRB4_LIBS -lresolv"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  ;;
-default)
-  for ac_hdr in krb.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4530: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4535 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-  echo $ac_n "checking for main in -lkrb""... $ac_c" 1>&6
-echo "configure:4567: checking for main in -lkrb" >&5
-ac_lib_var=`echo krb'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lkrb  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4575 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:4582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo krb | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lkrb $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test "$ac_cv_header_krb_h" = yes -a "$ac_cv_lib_krb_main" = yes; then
-    echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define KRB4 1
-EOF
-
-    KRB4_AUTH="auth-krb4.o"
-    KRB4_ROOT=""
-    KRB4_INCS=""
-    KRB4_LIBS="-lkrb -ldes"
-    echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
-echo "configure:4620: checking for dn_expand in -lresolv" >&5
-ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lresolv  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4628 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dn_expand();
-
-int main() {
-dn_expand()
-; return 0; }
-EOF
-if { (eval echo configure:4639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  KRB4_LIBS="$KRB4_LIBS -lresolv"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    echo "$ac_t""no" 1>&6
-  fi
-  ;;
-*)
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define KRB4 1
-EOF
-
-  KRB4_AUTH="auth-krb4.o"
-  KRB4_ROOT="$with_krb4"
-  KRB4_INCS="-I\$(KRB4_ROOT)/include"
-  KRB4_LIBS="-L\$(KRB4_ROOT)/lib -lkrb -ldes"
-  echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
-echo "configure:4674: checking for dn_expand in -lresolv" >&5
-ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lresolv  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4682 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dn_expand();
-
-int main() {
-dn_expand()
-; return 0; }
-EOF
-if { (eval echo configure:4693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  KRB4_LIBS="$KRB4_LIBS -lresolv"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  ;;
-esac
-    
-echo $ac_n "checking whether to use AFS""... $ac_c" 1>&6
-echo "configure:4717: checking whether to use AFS" >&5
-# Check whether --with-afs or --without-afs was given.
-if test "${with_afs+set}" = set; then
-  withval="$with_afs"
-  if test "$with_afs" = no; then
-      echo "$ac_t""no" 1>&6
-    else
-      echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define AFS 1
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define KERBEROS_TGT_PASSING 1
-EOF
-
-  RADIX="radix.o"
-  if test "$with_krb4" = no; then
-    echo "$ac_t""no" 1>&6
-    echo "configure: warning: "AFS requires Kerberos v4 support."" 1>&2
-  else
-    KRB4_LIBS="${KRB4_LIBS} -lkafs"
-    if test -n "$os_aix"; then
-      KRB4_LIBS="${KRB4_LIBS} -lld"
-    fi
-  fi
-fi
-
-fi
-
-
-echo $ac_n "checking whether to use libwrap""... $ac_c" 1>&6
-echo "configure:4749: checking whether to use libwrap" >&5
-# Check whether --with-libwrap or --without-libwrap was given.
-if test "${with_libwrap+set}" = set; then
-  withval="$with_libwrap"
-   case "$withval" in
-  no)
-    echo "$ac_t""no" 1>&6
-    ;;
-  yes)
-    echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define LIBWRAP 1
-EOF
-
-    LIBS="-lwrap $LIBS"
-    cat > conftest.$ac_ext <<EOF
-#line 4765 "configure"
-#include "confdefs.h"
- int allow_severity; int deny_severity; 
-int main() {
- hosts_access(); 
-; return 0; }
-EOF
-if { (eval echo configure:4772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-   { echo "configure: error: Could not find the libwrap.a library.  You must first install tcp_wrappers." 1>&2; exit 1; } 
-fi
-rm -f conftest*
-    ;;
-  *)
-    echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define LIBWRAP 1
-EOF
-
-    LIBS="$withval $LIBS"
-    cat > conftest.$ac_ext <<EOF
-#line 4790 "configure"
-#include "confdefs.h"
- int allow_severity; int deny_severity; 
-int main() {
- hosts_access(); 
-; return 0; }
-EOF
-if { (eval echo configure:4797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-   { echo "configure: error: Could not find the $withval library.  You must first install tcp_wrappers." 1>&2; exit 1; } 
-fi
-rm -f conftest*
-    ;;
-  esac 
-else
-  echo "$ac_t""no" 1>&6
-
-fi
-
-
-echo $ac_n "checking whether to support SOCKS""... $ac_c" 1>&6
-echo "configure:4815: checking whether to support SOCKS" >&5
-# Check whether --with-socks or --without-socks was given.
-if test "${with_socks+set}" = set; then
-  withval="$with_socks"
-   case "$withval" in
-  no)
-    echo "$ac_t""no" 1>&6
-    ;;
-  *)
-    echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define SOCKS 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define connect Rconnect
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define getsockname Rgetsockname
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define bind Rbind
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define accept Raccept
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define listen Rlisten
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define select Rselect
-EOF
-
-    if test "x$withval" = "xyes"; then
-      withval="-lsocks"
-    fi
-    LIBS="$withval $LIBS"
-    cat > conftest.$ac_ext <<EOF
-#line 4858 "configure"
-#include "confdefs.h"
-
-int main() {
- Rconnect(); 
-; return 0; }
-EOF
-if { (eval echo configure:4865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-   { echo "configure: error: Could not find the $withval library.  You must first install socks." 1>&2; exit 1; } 
-fi
-rm -f conftest*
-    ;;
-  esac 
-else
-  echo "$ac_t""no" 1>&6
-
-fi
-
-
-PIDDIR="/var/run"
-echo $ac_n "checking where to put sshd.pid""... $ac_c" 1>&6
-echo "configure:4884: checking where to put sshd.pid" >&5
-if test '!' -d $PIDDIR; then
-  PIDDIR="$ETCDIR"
-fi
-echo "$ac_t""$PIDDIR" 1>&6
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-DEFS=-DHAVE_CONFIG_H
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile sshd.8 ssh.1 config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@CC@%$CC%g
-s%@CPP@%$CPP%g
-s%@GMPINCS@%$GMPINCS%g
-s%@GMPLIBS@%$GMPLIBS%g
-s%@LIBOBJS@%$LIBOBJS%g
-s%@LN_S@%$LN_S%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@RANLIB@%$RANLIB%g
-s%@MAKEDEP@%$MAKEDEP%g
-s%@WISH@%$WISH%g
-s%@XAUTH_PATH@%$XAUTH_PATH%g
-s%@RSH_PATH@%$RSH_PATH%g
-s%@KRB4_AUTH@%$KRB4_AUTH%g
-s%@KRB4_ROOT@%$KRB4_ROOT%g
-s%@KRB4_INCS@%$KRB4_INCS%g
-s%@KRB4_LIBS@%$KRB4_LIBS%g
-s%@RADIX@%$RADIX%g
-s%@ETCDIR@%$ETCDIR%g
-s%@PIDDIR@%$PIDDIR%g
-s%@RSAREFDEP@%$RSAREFDEP%g
-s%@CONFOBJS@%$CONFOBJS%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile sshd.8 ssh.1"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="config.h"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-
-rm -f conftest.tail
-while :
-do
-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-  echo 'CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
-done
-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
-  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
-  fi
-fi; done
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/usr.bin/ssh/configure.in b/usr.bin/ssh/configure.in
deleted file mode 100644
index 84b06b0990e..00000000000
--- a/usr.bin/ssh/configure.in
+++ /dev/null
@@ -1,815 +0,0 @@
-#
-# configure.in
-#
-# Author: Tatu Ylonen <ylo@cs.hut.fi>
-#
-# Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-#                    All rights reserved
-#
-# Created: Wed Mar 22 18:02:48 1995 ylo
-#
-# $Id: configure.in,v 1.1 1999/09/26 20:53:35 deraadt Exp $
-#
-
-AC_INIT(sshd.c)
-AC_CONFIG_HEADER(config.h)
-AC_PREREQ(2.4)
-
-AC_CANONICAL_HOST
-
-AC_PROG_CC
-AC_PROG_CPP
-
-case "$host" in
-  *-*-sunos4.1.1*)
-    os_sunos=yes
-    # Tim Adam <tma@osa.com.au> says speed_t is defined in stdtypes.h
-    AC_DEFINE(SPEED_T_IN_STDTYPES_H)
-    ;;
-  *-*-sunos*)
-    os_sunos=yes
-    ;;
-  *-sgi-irix5*)
-    # Irix stuff from snabb@niksula.hut.fi and tsurmacz@asic.ict.pwr.wroc.pl.
-    no_libsocket=yes
-    no_libsun=yes
-    ;;
-  *-sgi-irix6*)
-    # from d-champion@uchicago.edu
-    no_libsocket=yes
-    no_libsun=yes
-    if test "`uname -s`" = "IRIX64"; then
-      CFLAGS="-32 $CFLAGS"
-      LDFLAGS="-32 $LDFLAGS"
-    fi
-    ;;
-  *-ibm-aix3.2|*-ibm-aix3.2.0|*-ibm-aix3.2.1|*-ibm-aix3.2.2|*-ibm-aix3.2.3|*-ibm-aix3.2.4)
-    os_aix=yes
-    AC_CHECK_LIB(s, getuserattr)
-    ;;
-  *-ibm-aix*)
-    os_aix=yes
-    AC_CHECK_LIB(s, getuserattr)
-    ;;
-  mips-dec-mach3*)
-    # Mach3 stuff from kivinen@hut.fi
-    no_vhangup=yes
-    ;;
-  *-dec-ultrix*)
-    # Ultrix stuff from dmckilli@qc.bell.ca, jbotz@orixa.mtholyoke.edu.
-    AC_DEFINE(O_NONBLOCK_BROKEN)
-    no_vhangup=yes
-    AC_TRY_COMPILE([#include <syslog.h>],
-		   [int foo = LOG_DAEMON; ],
-		   ,
-		   AC_DEFINE(NEED_SYS_SYSLOG_H))
-    ;;
-  *-*-hpux*)
-    # HPUX flags from jgotts@engin.umich.edu
-    if test -z "$GCC"; then
-      CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE"
-    fi
-    AC_DEFINE(HPSUX_NONSTANDARD_X11_KLUDGE)
-    ;;
-  alpha-dec-osf*)
-    AC_DEFINE(TTY_GROUP, "terminal")
-    AC_CHECK_LIB(security, set_auth_parameters)
-    AC_MSG_CHECKING(for OSF/1 C2 security package)
-    osfc2sec=`/usr/sbin/setld -i | grep '^OSFC2SEC'`
-    if test -n "$osfc2sec"; then
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_OSF1_C2_SECURITY)
-      AC_CHECK_LIB(security, set_auth_parameters,
-                   LIBS="$LIBS -lsecurity",
-                   AC_MSG_ERROR("Could not find libsecurity even though C2 security installed."))
-      CONFOBJS="$CONFOBJS osfc2.o"
-    else
-      AC_MSG_RESULT(no)
-    fi
-    ;;
-  *-*-nextstep*)
-    # Nextstep support from a person who wants to remain anonymous
-    no_termios=yes
-    AC_DEFINE(SPEED_T_IN_STDTYPES_H)
-    ;;
-  *-*-linux*)
-    # Linux shadow password support (Andrew.Macpherson.1248566@bnr.co.uk)
-    if test -f /etc/shadow && test -f /etc/login.defs; then
-      AC_MSG_RESULT(Using linux John Haugh shadow passwords and pw_encrypt for password encryption)
-      AC_DEFINE(crypt,pw_encrypt)
-      LIBS="$LIBS -lshadow"
-    fi
-    ;;
-  i*86-*-bsdi*)
-    no_pipe=yes
-    ;;
-  i*86-unknown-bsd*)
-    # Assume 386BSD.  pgut01@cs.auckland.ac.nz reported this makes it compile.
-    AC_DEFINE(__FreeBSD__)
-    ;;
-  m68k-sony-newsos*)
-    # From snabb@niksula.hut.fi
-    no_vhangup=yes
-    ;;
-  m88k-dg-dgux*)
-    AC_DEFINE(BROKEN_INET_ADDR)
-    ;;
-  *-cray-unicos*)
-    CFLAGS="$CFLAGS -DCRAY_STACKSEG_END=_getb67"
-    ;;
-  *-*-sysv4*)
-    AC_CHECK_LIB(gen, openlog)
-    ;;
-  *-*-machten*)
-    AC_DEFINE(USE_STRLEN_FOR_AF_UNIX)
-    ;;
-  i*86-unknown-sco*)
-    # From moi@dio.com
-    AC_DEFINE(HAVE_SCO_ETC_SHADOW)
-    AC_DEFINE(SCO)
-    no_ranlib=yes
-    LIBS="-L/usr/lib/libp -lprot -lx $LIBS"
-    ;;
-  *-convex-bsd*)
-    # From mark.martinec@nsc.ijs.si
-    # On Convex, getpwnam sets pw_passwd if running as root
-    no_shadows_password_checking=yes
-    ;;
-  *-*-freebsd*)
-    # From Ollivier Robert: FreeBSD and NetBSD use master.passwd, but set
-    # pw_passwd automatically when running as root.
-    no_shadow_password_checking=yes
-    ;;
-  *-*-netbsd*)
-    # From Ollivier Robert: FreeBSD and NetBSD use master.passwd, but set
-    # pw_passwd automatically when running as root.
-    no_shadow_password_checking=yes
-    ;;
-  *-*-openbsd*)
-    no_shadow_password_checking=yes
-    ;;
-  *)
-    ;;
-esac
-
-# Socket pairs appear to be broken on several systems.  I don't know exactly
-# where, so I'll use pipes everywhere for now.
-AC_DEFINE(USE_PIPES)
-
-AC_MSG_CHECKING([that the compiler works])
-AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
-    AC_MSG_RESULT(yes),
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.),
-    AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.))
-
-if test -z "$no_pipe"; then
-if test -n "$GCC"; then
-  AC_MSG_CHECKING([if the compiler understands -pipe])
-  OLDCC="$CC"
-  CC="$CC -pipe"
-  AC_TRY_COMPILE(,,
-    AC_MSG_RESULT(yes),
-    CC="$OLDCC"
-    AC_MSG_RESULT(no))
-fi
-fi
-
-AC_ARG_ENABLE(warnings,
-[  --enable-warnings       Enable -Wall if using gcc.],
-[ if test -n "$GCC"; then 
-    AC_MSG_RESULT(Adding -Wall to CFLAGS.)
-    CFLAGS="$CFLAGS -Wall"
-  fi])
-
-if test -z "$no_vhangup"; then
-  AC_CHECK_FUNCS(vhangup)
-fi
-
-if test -z "$no_setsid"; then
-  AC_CHECK_FUNCS(setsid)
-fi
-
-AC_MSG_CHECKING(where to find mandatory GMP library)
-AC_ARG_WITH(gmp,
-[  --with-gmp[=PATH]      Where to find GMP library.],
-[ case "$withval" in
-  no)
-    echo "GMP is mandatory! Aborting!"
-    exit 1
-    ;;
-  *)
-    ;;
-  esac ],
-[ with_gmp=yes ]
-)
-# gmp continued
-echo argument="$with_gmp"
-case "$with_gmp" in
-yes)
-  AC_CHECK_HEADERS(gmp.h)
-  if test "$ac_cv_header_gmp_h" != yes; then
-    echo "Can't find include file gmp.h! Aborting!"
-    echo "You must first build and install GMP, please read the file INSTALL"
-    exit 1
-  fi
-  AC_CHECK_LIB(gmp, main)
-  if test "$ac_cv_lib_gmp_main" != yes; then
-    echo "Can't find library gmp (libgmp.a)! Aborting"
-    echo "You must first build and install GMP, please read the file INSTALL"
-    exit 1
-  fi
-  GMPINCS=""
-  GMPLIBS="-lgmp"
-  ;;
-*)
-  GMPINCS="-I$with_gmp/include"
-  GMPLIBS="-L$with_gmp/lib -lgmp"
-  ;;
-esac
-AC_SUBST(GMPINCS) dnl
-AC_SUBST(GMPLIBS) dnl
-
-AC_CHECK_FUNCS(_getpty clock fchmod getdtablesize gethostname getrusage)
-AC_CHECK_FUNCS(gettimeofday initgroups innetgr memcpy openpty popen seteuid)
-AC_CHECK_FUNCS(setlogin setluid setrlimit strchr times ulimit umask vsnprintf)
-
-AC_TYPE_SIGNAL
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-AC_TYPE_OFF_T
-AC_TYPE_MODE_T
-AC_STRUCT_ST_BLKSIZE
-
-AC_C_CONST
-AC_C_INLINE
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(short)
-
-if test -z "$no_termios"; then
-  AC_CHECK_HEADERS(termios.h)
-fi
-
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(unistd.h rusage.h sys/time.h lastlog.h utmp.h utmpx.h)
-AC_CHECK_HEADERS(sgtty.h sys/select.h sys/ioctl.h sys/filio.h)
-AC_CHECK_HEADERS(paths.h usersec.h utime.h netinet/in_systm.h ulimit.h)
-AC_HEADER_TIME
-AC_HEADER_DIRENT
-AC_HEADER_STAT
-AC_EGREP_HEADER(ut_pid, utmp.h, AC_DEFINE(HAVE_PID_IN_UTMP))
-AC_EGREP_HEADER(ut_name, utmp.h, AC_DEFINE(HAVE_NAME_IN_UTMP))
-AC_EGREP_HEADER(ut_id, utmp.h, AC_DEFINE(HAVE_ID_IN_UTMP))
-AC_EGREP_HEADER(ut_host, utmp.h, AC_DEFINE(HAVE_HOST_IN_UTMP))
-AC_EGREP_HEADER(ut_addr, utmp.h, AC_DEFINE(HAVE_ADDR_IN_UTMP))
-
-AC_EGREP_HEADER(ut_session, utmpx.h, AC_DEFINE(HAVE_UT_SESSION))
-AC_EGREP_HEADER(ut_syslen, utmpx.h, AC_DEFINE(HAVE_UT_SYSLEN))
-
-AC_CHECK_LIB(c, crypt, [true], AC_CHECK_LIB(crypt, crypt))
-AC_CHECK_LIB(nsl, main)
-if test -z "$no_libsocket"; then
-  AC_CHECK_LIB(socket, socket)
-fi
-if test -z "$no_libsun"; then
-  AC_CHECK_LIB(sun, getpwnam)
-fi
-AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN)
-			  LIBS="$LIBS -lutil")
-
-AC_CHECK_LIB(des, main)
-
-AC_REPLACE_FUNCS(strerror memmove remove random putenv socketpair)
-
-AC_PROG_LN_S
-AC_PROG_INSTALL
-if test -z "$no_ranlib"; then
-  AC_PROG_RANLIB
-else
-  RANLIB=":"
-fi
-AC_PROGRAMS_CHECK(MAKEDEP, makedepend makedep, makedepend)
-AC_PATH_PROGS(WISH, wish8.0 wish wishx wish4.1 true)
-if test `basename $WISH` = "true"; then
-  AC_MSG_WARN(the wish program was not found - ssh-askpass will not work.)
-  WISH="/usr/local/bin/wish"
-fi
-AC_PATH_PROG(XAUTH_PATH, xauth, , $PATH:/usr/X11R6/bin)
-if test -n "$XAUTH_PATH"; then
-  AC_DEFINE_UNQUOTED(XAUTH_PATH, "$XAUTH_PATH")
-fi
-
-AC_MSG_CHECKING(for pseudo ttys)
-if test -c /dev/ptmx && test -c /dev/pts/0
-then
-  AC_DEFINE(HAVE_DEV_PTMX)
-  AC_MSG_RESULT(streams ptys)
-else
-if test -c /dev/pts && test -c /dev/ptc
-then
-  AC_DEFINE(HAVE_DEV_PTS_AND_PTC)
-  AC_MSG_RESULT(/dev/pts and /dev/ptc)
-else
-  AC_MSG_RESULT(bsd-style ptys)
-fi
-fi
-
-AC_MSG_CHECKING(for /etc/default/login)
-if test -f /etc/default/login; then
-  AC_DEFINE(HAVE_ETC_DEFAULT_LOGIN)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-if test -z "$no_shadows_password_checking"; then
-  AC_MSG_CHECKING(for shadow passwords)
-  if test -f /etc/shadow; then
-    AC_DEFINE(HAVE_ETC_SHADOW)
-    AC_MSG_RESULT(/etc/shadow)
-  elif test -n "$os_aix"; then
-    AC_DEFINE(HAVE_ETC_SECURITY_PASSWD)
-    AC_MSG_RESULT(/etc/security/passwd)
-  elif test -n "$os_sunos"; then
-    AC_DEFINE(HAVE_ETC_SECURITY_PASSWD_ADJUNCT)
-    AC_MSG_RESULT(/etc/security/passwd.adjunct)
-  else
-    AC_MSG_RESULT(no)
-  fi
-fi
-
-AC_MSG_CHECKING(location of mail spool files)
-for dir in /var/spool/mail /var/mail /usr/spool/mail /usr/mail NEWMAIL
-do
-  if test "$dir" = "NEWMAIL"; then
-    AC_DEFINE(HAVE_TILDE_NEWMAIL)
-    AC_MSG_RESULT(\$HOME/newmail)
-    AC_MSG_WARN(mail spool directory was not found: assuming you use \$HOME/newmail)
-  elif test -d $dir; then
-    AC_DEFINE_UNQUOTED(MAIL_SPOOL_DIRECTORY, "$dir")
-    AC_MSG_RESULT($dir)
-    break
-  fi
-done
-
-AC_MSG_CHECKING(location of utmp)
-if test -f /var/run/utmp; then
-  AC_DEFINE(SSH_UTMP, "/var/run/utmp")
-  AC_MSG_RESULT(/var/run/utmp)
-elif test -f /var/log/utmp; then
-  AC_DEFINE(SSH_UTMP, "/var/log/utmp")
-  AC_MSG_RESULT(/var/log/utmp)
-elif test -f /var/adm/utmp; then
-  AC_DEFINE(SSH_UTMP, "/var/adm/utmp")
-  AC_MSG_RESULT(/var/adm/utmp)
-elif test -f /usr/adm/utmp; then
-  AC_DEFINE(SSH_UTMP, "/usr/adm/utmp")
-  AC_MSG_RESULT(/usr/adm/utmp)
-elif test -f /etc/utmp; then
-  AC_DEFINE(SSH_UTMP, "/etc/utmp")
-  AC_MSG_RESULT(/etc/utmp)
-else
-  AC_MSG_RESULT(not found)
-fi
-
-AC_MSG_CHECKING(location of wtmp)
-if test -f /var/log/wtmp; then
-  AC_DEFINE(SSH_WTMP, "/var/log/wtmp")
-  AC_MSG_RESULT(/var/log/wtmp)
-elif test -f /var/adm/wtmp; then
-  AC_DEFINE(SSH_WTMP, "/var/adm/wtmp")
-  AC_MSG_RESULT(/var/adm/wtmp)
-elif test -f /usr/adm/wtmp; then
-  AC_DEFINE(SSH_WTMP, "/usr/adm/wtmp")
-  AC_MSG_RESULT(/usr/adm/wtmp)
-elif test -f /etc/wtmp; then
-  AC_DEFINE(SSH_WTMP, "/etc/wtmp")
-  AC_MSG_RESULT(/etc/wtmp)
-else
-  AC_DEFINE(SSH_WTMP, "/var/adm/wtmp")
-  AC_MSG_RESULT(not found)
-fi
-
-AC_MSG_CHECKING(location of lastlog)
-if test -f /var/log/lastlog || test -d /var/log/lastlog; then
-  AC_DEFINE(SSH_LASTLOG, "/var/log/lastlog")
-  AC_DEFINE(HAVE_LASTLOG)
-  LASTLOG=/var/log/lastlog
-  AC_MSG_RESULT(/var/log/lastlog)
-elif test -f /var/adm/lastlog || test -d /var/adm/lastlog; then
-  AC_DEFINE(SSH_LASTLOG, "/var/adm/lastlog")
-  AC_DEFINE(HAVE_LASTLOG)
-  LASTLOG=/var/adm/lastlog
-  AC_MSG_RESULT(/var/adm/lastlog)
-elif test -f /usr/adm/lastlog || test -d /usr/adm/lastlog; then
-  AC_DEFINE(SSH_LASTLOG, "/usr/adm/lastlog")
-  AC_DEFINE(HAVE_LASTLOG)
-  LASTLOG=/usr/adm/lastlog
-  AC_MSG_RESULT(/usr/adm/lastlog)
-elif test -f /etc/lastlog || test -d /etc/lastlog; then
-  AC_DEFINE(SSH_LASTLOG, "/etc/lastlog")
-  AC_DEFINE(HAVE_LASTLOG)
-  LASTLOG=/etc/lastlog
-  AC_MSG_RESULT(/etc/lastlog)
-else
-  AC_MSG_RESULT(not found)
-  AC_DEFINE(SSH_LASTLOG, "/var/log/lastlog")
-  LASTLOG=/var/log/lastlog
-fi
-
-AC_MSG_CHECKING(whether $LASTLOG is a directory)
-if test -d $LASTLOG
-then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(LASTLOG_IS_DIR)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(whether to include the IDEA encryption algorithm)
-AC_ARG_WITH(idea,
-[  --with-idea             Use IDEA (not default).
-  --without-idea          Don't use IDEA: avoids patent problems in commercial use],
-[ case "$withval" in
-  yes)
-    AC_MSG_RESULT(yes)
-    CONFOBJS="$CONFOBJS idea.o"
-    AC_DEFINE(WITH_IDEA)
-    ;;
-  *)
-    AC_MSG_RESULT(no)
-    ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
-
-AC_MSG_CHECKING(whether to include the RC4 encryption algorithm)
-AC_ARG_WITH(rc4,
-[  --with-rc4          Include RC4 support.
-  --without-rc4       Don't include RC4 support (default)],
-[ case "$withval" in
-  yes)
-    AC_MSG_RESULT(yes)
-    CONFOBJS="$CONFOBJS rc4.o"
-    AC_DEFINE(WITH_RC4)
-    ;;
-  *)
-    AC_MSG_RESULT(no)
-    ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
-
-AC_MSG_CHECKING(whether to include the Blowfish encryption algorithm)
-AC_ARG_WITH(blowfish,
-[  --with-blowfish          Include Blowfish support (default).
-  --without-blowfish       Don't include Blowfish support],
-[ case "$withval" in
-  no)
-    ;;
-  *)
-    with_blowfish=yes
-    ;;
-  esac ],
-  with_blowfish=yes
-)
-
-case "$with_blowfish" in
-yes)
-    AC_DEFINE(WITH_BLOWFISH)
-    CONFOBJS="$CONFOBJS bf_skey.o bf_enc.o"
-    AC_MSG_RESULT(yes)
-    ;;
-no)
-    AC_MSG_RESULT(no)
-    ;;
-esac
-
-AC_MSG_CHECKING(whether to use rsaref)
-AC_ARG_WITH(rsaref,
-[  --with-rsaref           Use RSAREF (try to avoid patent problems in U.S.)
-  --without-rsaref        Use normal RSA routines (default). ],
-[ case "$withval" in
-  no)
-       AC_MSG_RESULT(no)
-       ;;
-  *)
-       AC_MSG_RESULT(yes)
-       AC_DEFINE(RSAREF)
-       RSAREFDEP="rsaref2/source/librsaref.a"
-       LIBS="-lrsaref $LIBS"
-       LDFLAGS="-Lrsaref2/source $LDFLAGS"
-       ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
-
-AC_MSG_CHECKING(whether to use ssl)
-AC_ARG_WITH(ssl,
-[  --with-ssl           Use SSL (try to avoid patent problems in U.S.)
-  --without-ssl         Use normal RSA routines (default). ],
-[ case "$withval" in
-  no)
-       AC_MSG_RESULT(no)
-       ;;
-  *)
-       AC_MSG_RESULT(yes)
-       AC_DEFINE(DO_SSL)
-       LIBS="-lcrypto $LIBS"
-       ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
-
-AC_MSG_CHECKING(whether to use rsh)
-AC_ARG_WITH(rsh, 
-[  --with-rsh=PATH         Specify where to find rsh.
-  --without-rsh           Do not use rsh under any conditions. ],
-[ case "$withval" in
-    no) 
-        AC_MSG_RESULT(no)
-	;;
-    yes) 
-	 AC_MSG_RESULT(yes)
-	 AC_PATH_PROGS(RSH_PATH, remsh rsh)
-         AC_DEFINE_UNQUOTED(RSH_PATH, "$RSH_PATH")
-	;;
-    *) 
-       AC_MSG_RESULT($withval)
-       AC_DEFINE_UNQUOTED(RSH_PATH, "$withval")
-       ;;
-  esac ],
-  [ AC_MSG_RESULT(yes)
-    AC_PATH_PROGS(RSH_PATH, remsh rsh)
-    AC_DEFINE_UNQUOTED(RSH_PATH, "$RSH_PATH") ]
-)
-
-# Code to permit setting default path for users (alden@math.ohio-state.edu)
-AC_MSG_CHECKING(default path)
-AC_ARG_WITH(path,
-[  --with-path=PATH        Default path passed to user shell by sshd.],
-[ case "$withval" in
-  no)
-    AC_MSG_RESULT(use system default)
-    ;;
-  *)
-    AC_MSG_RESULT($withval)
-    AC_DEFINE_UNQUOTED(DEFAULT_PATH, "$withval")
-    ;;
-  esac ],
-  AC_MSG_RESULT(use system default)
-)
-
-AC_MSG_CHECKING(etcdir)
-AC_ARG_WITH(etcdir,
-[  --with-etcdir=PATH      Directory containing ssh system files (default /etc).],
-[ case "$withval" in
-  no)
-    AC_MSG_ERROR(Need ETCDIR.)
-    ;;
-  yes)
-    ETCDIR="/etc"
-    AC_MSG_RESULT(/etc)
-    ;;
-  *)
-    ETCDIR="$withval"
-    AC_MSG_RESULT($withval)
-    ;;
-  esac ],
-  ETCDIR="/etc"
-  AC_MSG_RESULT(/etc)
-)
-
-AC_MSG_CHECKING(whether to support SecurID)
-AC_ARG_WITH(securid,
-[  --with-securid[=PATH]   Enable support for Security Dynamics SecurID card.],
-[ case "$withval" in
-  no)
-    AC_MSG_RESULT(no)
-    ;;
-  yes)
-    AC_MSG_RESULT(yes)
-    if test '!' -f /usr/ace/sdiclient.a; then
-      AC_ERROR(SecurID sdiclient.a not found in /usr/ace: you must supply the path.)
-    fi
-    AC_MSG_RESULT(yes)
-    AC_MSG_RESULT(Assuming SecurID headers and libraries are in /usr/ace.)
-    AC_DEFINE(HAVE_SECURID)
-    CFLAGS="$CFLAGS -I/usr/ace"
-    LIBS="/usr/ace/sdiclient.a $LIBS"
-    ;;
-  *)
-    AC_MSG_RESULT(yes)
-    if test '!' -f $withval/sdiclient.a; then
-      AC_ERROR(SecurID sdiclient.a not found in $withval: please supply the correct path.)
-    fi
-    AC_MSG_RESULT(Assuming SecurID headers and libraries are in $withval.)
-    AC_DEFINE(HAVE_SECURID)
-    CFLAGS="$CFLAGS -I$withval"
-    LIBS="$withval/sdiclient.a $LIBS"
-    ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
-
-AC_MSG_CHECKING(whether to include compression support)
-AC_ARG_WITH(zlib,
-[  --with-zlib            Use zlib (default).
-  --without-zlib          Don't use zlib.],
-[ case "$withval" in
-  no)
-    ;;
-  *)
-    with_zlib=yes
-    ;;
-  esac ],
-  with_zlib=yes
-)
-
-case "$with_zlib" in
-yes)
-    AC_MSG_RESULT(yes)
-    AC_CHECK_HEADERS(zlib.h)
-    if test "$ac_cv_header_zlib_h" != yes; then
-      echo "Can't find zlib.h, disable with --without-zlib"
-      exit 1
-    fi
-    AC_CHECK_LIB(z, main)
-    if test "$ac_cv_lib_z_main" != yes; then
-      echo "Can't find library z (libz.a), disable with --without-zlib"
-      exit 1
-    fi
-    CONFOBJS="$CONFOBJS compress.o"
-    AC_DEFINE(WITH_ZLIB)
-    ;;
-no)
-    AC_MSG_RESULT(no)
-    ;;
-esac
-
-AC_MSG_CHECKING(whether to use Kerberos v4)
-AC_ARG_WITH(krb4,
-[  --with-krb4[=PATH]      Compile in Kerberos v4 support.],
-[ case "$withval" in
-  yes)
-    ;;
-  no)
-    ;;
-  *)
-    ;;
-  esac ],
-[ with_krb4=default ]
-)
-# krb4 continued
-case "$with_krb4" in
-no)
-  AC_MSG_RESULT(no)
-  ;;
-yes)
-  AC_MSG_RESULT(yes)
-  AC_CHECK_HEADERS(krb.h)
-  if test "$ac_cv_header_krb_h" != yes; then
-    echo "Can't find include file krb.h! Aborting!"
-    exit 1
-  fi
-  AC_CHECK_LIB(krb, main)
-  if test "$ac_cv_lib_krb_main" != yes; then
-    echo "Can't find library krb (libkrb.a)! Aborting"
-    exit 1
-  fi
-  AC_DEFINE(KRB4)
-  KRB4_AUTH="auth-krb4.o"
-  KRB4_ROOT=""
-  KRB4_INCS=""
-  KRB4_LIBS="-lkrb -ldes"
-  AC_CHECK_LIB(resolv, dn_expand, KRB4_LIBS="$KRB4_LIBS -lresolv")
-  ;;
-default)
-  AC_CHECK_HEADERS(krb.h)
-  AC_CHECK_LIB(krb, main)
-  if test "$ac_cv_header_krb_h" = yes -a "$ac_cv_lib_krb_main" = yes; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(KRB4)
-    KRB4_AUTH="auth-krb4.o"
-    KRB4_ROOT=""
-    KRB4_INCS=""
-    KRB4_LIBS="-lkrb -ldes"
-    AC_CHECK_LIB(resolv, dn_expand, KRB4_LIBS="$KRB4_LIBS -lresolv")
-  else
-    AC_MSG_RESULT(no)
-  fi
-  ;;
-*)
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(KRB4)
-  KRB4_AUTH="auth-krb4.o"
-  KRB4_ROOT="$with_krb4"
-  KRB4_INCS="-I\$(KRB4_ROOT)/include"
-  KRB4_LIBS="-L\$(KRB4_ROOT)/lib -lkrb -ldes"
-  AC_CHECK_LIB(resolv, dn_expand, KRB4_LIBS="$KRB4_LIBS -lresolv")
-  ;;
-esac
-AC_SUBST(KRB4_AUTH) dnl
-AC_SUBST(KRB4_ROOT) dnl
-AC_SUBST(KRB4_INCS) dnl
-AC_SUBST(KRB4_LIBS) dnl
-
-AC_MSG_CHECKING(whether to use AFS)
-AC_ARG_WITH(afs,
-[  --with-afs              Compile in AFS support (requires KTH krb4).],
-if test "$with_afs" = no; then
-      AC_MSG_RESULT(no)
-    else
-      AC_MSG_RESULT(yes)
-  AC_DEFINE(AFS)
-  AC_DEFINE(KERBEROS_TGT_PASSING)
-  RADIX="radix.o"
-  if test "$with_krb4" = no; then
-    AC_MSG_RESULT(no)
-    AC_MSG_WARN("AFS requires Kerberos v4 support.")
-  else
-    KRB4_LIBS="${KRB4_LIBS} -lkafs"
-    if test -n "$os_aix"; then
-      KRB4_LIBS="${KRB4_LIBS} -lld"
-    fi
-  fi
-fi
-)
-AC_SUBST(RADIX)dnl
-
-AC_MSG_CHECKING(whether to use libwrap)
-AC_ARG_WITH(libwrap,
-[  --with-libwrap[=PATH]   Compile in libwrap (tcp_wrappers) support.],
-[ case "$withval" in
-  no)
-    AC_MSG_RESULT(no)
-    ;;
-  yes)
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(LIBWRAP)
-    LIBS="-lwrap $LIBS"
-    AC_TRY_LINK([ int allow_severity; int deny_severity; ],
-                [ hosts_access(); ],
-		[],
-		[ AC_MSG_ERROR(Could not find the libwrap.a library.  You must first install tcp_wrappers.) ])
-    ;;
-  *)
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(LIBWRAP)
-    LIBS="$withval $LIBS"
-    AC_TRY_LINK([ int allow_severity; int deny_severity; ],
-                [ hosts_access(); ],
-		[],
-		[ AC_MSG_ERROR(Could not find the $withval library.  You must first install tcp_wrappers.) ])
-    ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
-
-AC_MSG_CHECKING(whether to support SOCKS)
-AC_ARG_WITH(socks,
-[  --with-socks[=PATH]     Compile with SOCKS firewall traversal support.],
-[ case "$withval" in
-  no)
-    AC_MSG_RESULT(no)
-    ;;
-  *)
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(SOCKS)
-    AC_DEFINE(connect, Rconnect)
-    AC_DEFINE(getsockname, Rgetsockname)
-    AC_DEFINE(bind, Rbind)
-    AC_DEFINE(accept, Raccept)
-    AC_DEFINE(listen, Rlisten)
-    AC_DEFINE(select, Rselect)
-    if test "x$withval" = "xyes"; then
-      withval="-lsocks"
-    fi
-    LIBS="$withval $LIBS"
-    AC_TRY_LINK([],
-                [ Rconnect(); ],
-		[],
-		[ AC_MSG_ERROR(Could not find the $withval library.  You must first install socks.) ])
-    ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
-
-PIDDIR="/var/run"
-AC_MSG_CHECKING(where to put sshd.pid)
-if test '!' -d $PIDDIR; then
-  PIDDIR="$ETCDIR"
-fi
-AC_MSG_RESULT($PIDDIR)
-
-AC_ARG_PROGRAM
-
-AC_SUBST(ETCDIR)
-AC_SUBST(PIDDIR)
-AC_SUBST(RSAREFDEP)
-AC_SUBST(CONFOBJS)
-
-AC_OUTPUT(Makefile sshd.8 ssh.1)
diff --git a/usr.bin/ssh/install-sh b/usr.bin/ssh/install-sh
deleted file mode 100644
index 89fc9b098b8..00000000000
--- a/usr.bin/ssh/install-sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-tranformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/usr.bin/ssh/scp/Makefile b/usr.bin/ssh/scp/Makefile
new file mode 100644
index 00000000000..b1b6ef02983
--- /dev/null
+++ b/usr.bin/ssh/scp/Makefile
@@ -0,0 +1,12 @@
+.PATH:		${.CURDIR}/..
+
+PROG=	scp
+BINOWN=	root
+BINGRP=	root
+BINMODE=555
+BINDIR=	/usr/bin
+MAN=	scp.1
+
+SRCS=	scp.c xmalloc.c
+
+.include<bsd.prog.mk>
diff --git a/usr.bin/ssh/ssh-add/Makefile b/usr.bin/ssh/ssh-add/Makefile
new file mode 100644
index 00000000000..271b0ad3c2c
--- /dev/null
+++ b/usr.bin/ssh/ssh-add/Makefile
@@ -0,0 +1,21 @@
+.PATH:		${.CURDIR}/..
+
+PROG=	ssh-add
+BINOWN=	root
+BINGRP=	root
+BINMODE=555
+BINDIR=	/usr/bin
+LDADD=	-lkrb -lcrypto -ldes -lgmp -lutil -lz
+MAN=	ssh-add.1
+
+SRCS=	ssh-add.o log-client.o readpass.o rsa.o randoms.o ssh_md5.o buffer.o \
+	xmalloc.o bufaux.o authfd.o authfile.o crc32.c rsaglue.c match.c \
+	mpaux.c minfd.c cipher.c compress.c
+
+gen_minfd: gen_minfd.c
+
+minfd.o: minfd.h
+minfd.h: gen_minfd
+	./gen_minfd $(USER_SHELLS) > minfd.h
+
+.include<bsd.prog.mk>
diff --git a/usr.bin/ssh/ssh-agent/Makefile b/usr.bin/ssh/ssh-agent/Makefile
new file mode 100644
index 00000000000..0f36ed84774
--- /dev/null
+++ b/usr.bin/ssh/ssh-agent/Makefile
@@ -0,0 +1,20 @@
+.PATH:		${.CURDIR}/..
+
+PROG=	ssh-keygen
+BINOWN=	root
+BINGRP=	root
+BINMODE=555
+BINDIR=	/usr/bin
+LDADD=	-lkrb -lcrypto -ldes -lgmp -lutil -lz
+MAN=	ssh-keygen.1
+
+SRCS=	ssh-agent.c log-client.c rsa.c randoms.c ssh_md5.c buffer.c \
+	xmalloc.c bufaux.c authfd.c authfile.c rsaglue.c \
+	mpaux.c crc32.c match.c minfd.c cipher.c compress.c
+
+gen_minfd: gen_minfd.c
+minfd.o: minfd.h
+minfd.h: gen_minfd
+	./gen_minfd $(USER_SHELLS) > minfd.h
+
+.include<bsd.prog.mk>
diff --git a/usr.bin/ssh/ssh-keygen/Makefile b/usr.bin/ssh/ssh-keygen/Makefile
new file mode 100644
index 00000000000..1c2db5b8d56
--- /dev/null
+++ b/usr.bin/ssh/ssh-keygen/Makefile
@@ -0,0 +1,20 @@
+.PATH:		${.CURDIR}/..
+
+PROG=	ssh-keygen
+BINOWN=	root
+BINGRP=	root
+BINMODE=555
+BINDIR=	/usr/bin
+LDADD=	-lkrb -lcrypto -ldes -lgmp -lutil -lz
+MAN=	ssh-keygen.1
+
+SRCS=	ssh-keygen.c log-client.c readpass.c rsa.c randoms.c ssh_md5.c \
+	buffer.c xmalloc.c authfile.c mpaux.c bufaux.c \
+	crc32.c rsaglue.c match.c minfd.c cipher.c compress.c
+
+gen_minfd: gen_minfd.c
+minfd.o: minfd.h
+minfd.h: gen_minfd
+	./gen_minfd $(USER_SHELLS) > minfd.h
+
+.include<bsd.prog.mk>
diff --git a/usr.bin/ssh/ssh.h b/usr.bin/ssh/ssh.h
index 3aa6d8804f4..b2046f91574 100644
--- a/usr.bin/ssh/ssh.h
+++ b/usr.bin/ssh/ssh.h
@@ -13,7 +13,7 @@ Generic header file for ssh.
 
 */
 
-/* RCSID("$Id: ssh.h,v 1.1 1999/09/26 20:53:38 deraadt Exp $"); */
+/* RCSID("$Id: ssh.h,v 1.2 1999/09/26 21:47:55 deraadt Exp $"); */
 
 #ifndef SSH_H
 #define SSH_H
@@ -53,6 +53,9 @@ Generic header file for ssh.
    port if present. */
 #define SSH_SERVICE_NAME	"ssh"
 
+#define ETCDIR			"/etc"
+#define PIDDIR			"/var/run"
+
 /* System-wide file containing host keys of known hosts.  This file should be
    world-readable. */
 #define SSH_SYSTEM_HOSTFILE	ETCDIR "/ssh_known_hosts"
@@ -63,6 +66,12 @@ and HOST_CONFIG_FILE		/etc/ssh_config
 are all defined in Makefile.in.  Of these, ssh_host_key should be readable
 only by root, whereas ssh_config should be world-readable. */
 
+#define HOST_KEY_FILE		"/etc/ssh_host_key"
+#define SERVER_CONFIG_FILE	"/etc/sshd_config"
+#define HOST_CONFIG_FILE	"/etc/ssh_config"
+
+#define SSH_PROGRAM		"/usr/bin/ssh"
+
 /* Random seed file for the daemon.  This file should be readable only by 
    root. */
 #define SSH_DAEMON_SEED_FILE	ETCDIR "/ssh_random_seed"
diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile
new file mode 100644
index 00000000000..92f0c197377
--- /dev/null
+++ b/usr.bin/ssh/ssh/Makefile
@@ -0,0 +1,116 @@
+.PATH:		${.CURDIR}/..
+
+PROG=	ssh
+BINOWN=	root
+BINGRP=	root
+BINMODE=4555
+BINDIR=	/usr/bin
+LDADD=	-lkrb -lcrypto -ldes -lgmp -lutil -lz
+MAN=	ssh.1
+
+SRCS=	ssh.c sshconnect.c log-client.c readconf.c hostfile.c readpass.c \
+	tildexpand.c uidswap.c clientloop.c canohost.c rsa.c randoms.c \
+	ssh_md5.c buffer.c packet.c xmalloc.c ttymodes.c channels.c bufaux.c \
+	authfd.c authfile.c crc32.c rsaglue.c match.c mpaux.c minfd.c cipher.c \
+	compress.c
+
+gen_minfd: gen_minfd.c
+minfd.o: minfd.h
+minfd.h: gen_minfd
+	./gen_minfd $(USER_SHELLS) > minfd.h
+
+########################
+
+# Creates /etc/ssh_host_key
+generate-host-key:
+	-@if test -f $(install_prefix)$(HOST_KEY_FILE); \
+          then echo "You already have a host key in $(install_prefix)$(HOST_KEY_FILE)."; \
+	  else \
+	    umask 022; echo "Generating 1024 bit host key."; \
+	    ./ssh-keygen -b 1024 -f $(install_prefix)$(HOST_KEY_FILE) -N ''; \
+	  fi
+
+# Ssh is much to large and hairy to be installed suid root by
+# default. Disabled for now/bg. If you really need rhosts
+# authentication do a manual chmod u+s $(install_prefix)$(bindir)/ssh.
+#
+# Ssh is preferably installed suid root.  It can also be used non-root,
+# but then it cannot connect from a privileged socket, and rhosts
+# authentication will be disabled.
+#
+# Sshd is not suid root, but should preferably be run as root
+# (otherwise it can only log in as the user it runs as, and must be
+# bound to a non-privileged port).  Also, password authentication may
+# not be available if non-root and using shadow passwords.
+install: $(PROGRAMS) make-dirs generate-host-key
+	$(INSTALL_PROGRAM) -o root -m 0755 ssh $(install_prefix)$(bindir)/ssh
+	-if test "`echo ssh | sed '$(transform)'`" '!=' ssh; then \
+	  rm -f $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; \
+	  $(LN_S) ssh \
+	    $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; fi
+	rm -f $(install_prefix)$(bindir)/slogin
+	$(LN_S) ssh $(install_prefix)$(bindir)/slogin
+	-if test "`echo slogin | sed '$(transform)'`" '!=' slogin; then \
+	  rm -f $(install_prefix)$(bindir)/`echo slogin | sed '$(transform)'`;\
+	  $(LN_S) ssh \
+	    $(install_prefix)$(bindir)/`echo slogin | sed '$(transform)'`; fi
+	-for p in $(NORMAL_PROGRAMS); do \
+	  $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(bindir)/$$p; \
+	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
+	    rm -f $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; \
+	    $(LN_S) $$p \
+	      $(install_prefix)$(bindir)/`echo $$p | sed '$(transform)'`; fi; \
+	done
+# Remove $(etcdir)/sshd_pid as it is now $(bindir)/sshd.pid
+	-rm -f $(install_prefix)$(etcdir)/sshd_pid
+# Remove $(bindir)/sshd to avoid confusion since it is now in $(sbindir)
+	-rm -f $(install_prefix)$(bindir)/sshd
+	-rm -f $(install_prefix)$(bindir)/`echo sshd | sed '$(transform)'`
+	-for p in $(SBIN_PROGRAMS); do \
+	  $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(sbindir)/$$p; \
+	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
+	    rm -f $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`;\
+	    $(LN_S) $$p \
+	      $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; fi;\
+	done
+	-for p in $(MAN1PAGES); do \
+	  $(INSTALL_DATA) -m 0644 $(srcdir)/$$p $(install_prefix)$(man1dir)/$$p ; \
+	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
+	    rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\
+	    $(LN_S) $$p \
+	      $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`; \
+	  fi; \
+	done
+	rm -f $(install_prefix)$(man1dir)/slogin.1
+	$(LN_S) ssh.1 $(install_prefix)$(man1dir)/slogin.1
+	if test "`echo slogin.1 | sed '$(transform)'`" '!=' slogin.1; then \
+	  rm -f $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`;\
+	  $(LN_S) ssh.1 \
+	    $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`; \
+	fi
+	-for p in $(MAN1GENERATED); do \
+	  $(INSTALL_DATA) -m 0644 $$p $(install_prefix)$(man1dir)/$$p ; \
+	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
+	    rm -f $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`;\
+	    $(LN_S) $$p \
+	      $(install_prefix)$(man1dir)/`echo $$p | sed '$(transform)'`; \
+	  fi; \
+	done
+	-for p in $(MAN8GENERATED); do \
+	  $(INSTALL_DATA) -m 0644 $$p $(install_prefix)$(man8dir)/$$p; \
+	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
+	    rm -f $(install_prefix)$(man8dir)/`echo $$p | sed '$(transform)'`;\
+	    $(LN_S) $$p \
+	      $(install_prefix)$(man8dir)/`echo $$p | sed '$(transform)'`; fi;\
+	done
+	-if test '!' -f $(install_prefix)$(HOST_CONFIG_FILE); then \
+	  $(INSTALL_DATA) -m 0644 $(srcdir)/host_config.sample \
+	    $(install_prefix)$(HOST_CONFIG_FILE); fi
+	-if test '!' -f $(install_prefix)$(SERVER_CONFIG_FILE); then \
+	  cat $(srcdir)/server_config.sample | \
+	  sed "s#_ETCDIR_#$(etcdir)#g" >/tmp/ssh_inst.$$; \
+	  $(INSTALL_DATA) -m 0644 /tmp/ssh_inst.$$ \
+	    $(install_prefix)$(SERVER_CONFIG_FILE); \
+	  rm -f /tmp/ssh_inst.$$; fi
+
+.include<bsd.prog.mk>
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
new file mode 100644
index 00000000000..ec784594295
--- /dev/null
+++ b/usr.bin/ssh/sshd/Makefile
@@ -0,0 +1,24 @@
+.PATH:		${.CURDIR}/..
+
+PROG=	sshd
+BINOWN=	root
+BINGRP=	root
+BINMODE=555
+BINDIR=	/usr/sbin
+LDADD=	-lkrb -lcrypto -ldes -lgmp -lutil -lz
+MAN=	sshd.8
+
+SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c pty.c \
+	log-server.c login.c hostfile.c canohost.c servconf.c tildexpand.c \
+	uidswap.c serverloop.c rsa.c randoms.c \
+	ssh_md5.c buffer.c packet.c xmalloc.c ttymodes.c channels.c bufaux.c \
+	authfd.c authfile.c crc32.c rsaglue.c match.c mpaux.c minfd.c cipher.c \
+	compress.c
+
+gen_minfd: gen_minfd.c
+
+minfd.o: minfd.h
+minfd.h: gen_minfd
+	./gen_minfd $(USER_SHELLS) > minfd.h
+
+.include<bsd.prog.mk>