diff -Naur ossh-1.5.12.org/Makefile ossh-1.5.12.new/Makefile --- ossh-1.5.12.org/Makefile Thu Jan 1 01:00:00 1970 +++ ossh-1.5.12.new/Makefile Wed Mar 26 21:48:50 2003 @@ -0,0 +1,355 @@ +# Generated automatically from Makefile.in by configure. +# +# Makefile.in +# +# Author: Tatu Ylonen +# +# Copyright (c) 1995 Tatu Ylonen , Espoo, Finland +# All rights reserved +# +# Created: Wed Mar 22 17:37:49 1995 ylo +# +# $Id: Makefile.in,v 1.31 1999/11/10 21:53:03 bg Exp $ +# + +srcdir = . + + +install_prefix = +prefix = /usr/local +exec_prefix = ${prefix} +bindir = $(exec_prefix)/bin +sbindir = $(exec_prefix)/sbin +libexec = $(exec_prefix)/libexec +mandir = $(prefix)/man +man1dir = $(mandir)/man1 +man8dir = $(mandir)/man8 +etcdir = /etc +piddir = /var/run + +CROSS = +CC = $(CROSS)cc +STRIP = $(CROSS)strip --remove-section=.note --remove-section=.comment +CFLAGS = -Os -I. +LDFLAGS = +DEFS = -DHAVE_CONFIG_H +LIBS = -lz -lnsl -lcrypt -lgmp -lutil -lcrypto +LIBOBJS = +CONFOBJS = bf_skey.o bf_enc.o compress.o + +MAKEDEP = makedepend +LN_S = ln -s +RANLIB = $(CROSS)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/ssh_host_key +HOST_CONFIG_FILE = $(etcdir)/ssh/ssh_config +SERVER_CONFIG_FILE = $(etcdir)/ssh/sshd_config + +SHELL = /bin/sh + +#ZLIBLIBS = -L$(ZLIBDIR) -lz +#ZINCS = + +RSAREFDIR = rsaref2 +RSAREFSRCDIR = $(RSAREFDIR)/source + +CIPHER_OBJS = cipher.o deattack.o crc32.o $(CONFOBJS) +COMMON_OBJS = $(LIBOBJS) \ + rsa.o randoms.o ssh_md5.o buffer.o packet.o \ + xmalloc.o ttymodes.o channels.o nchan.o compat.o \ + bufaux.o authfd.o authfile.o \ + rsaglue.o match.o mpaux.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 fingerprint.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 $(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 $(LIBOBJS) +SCP_OBJS = scp.o xmalloc.o +FINGERPRINT_OBJS = ssh-fingerprint.o fingerprint.o \ + rsa.o randoms.o ssh_md5.o xmalloc.o + +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) $(FINGERPRINT_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 COPYING.Ylonen README.AFS-KERBEROS README README.SECURID \ + INSTALL TODO OVERVIEW \ + configure configure.in config.guess config.sub Makefile.in \ + ssh-askpass.wish ssh_config config.sample \ + acconfig.h config.h.in sshd_config sshd.sh \ + $(MAN1SOURCES) $(MAN8SOURCES) *.c *.h install-sh \ + RFC.nroff RFC nchan.ms \ + ChangeLog + +DISTNAME = `sed 's/.*"\(.*\)".*/\1/' version.h` + +NORMAL_PROGRAMS = ssh-keygen ssh-askpass ssh-agent ssh-add scp ssh-fingerprint + +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) + $(STRIP) sshd + +ssh: $(SSH_OBJS) $(RSAREFDEP) + -rm -f ssh + $(CC) $(LDFLAGS) -o ssh $(SSH_OBJS) $(GMPLIBS) $(ZLIBLIBS) $(KRB4_LIBS) $(LIBS) + $(STRIP) ssh + +ssh-keygen: $(KEYGEN_OBJS) $(RSAREFDEP) + -rm -f ssh-keygen + $(CC) $(LDFLAGS) -o ssh-keygen $(KEYGEN_OBJS) $(GMPLIBS) $(KRB4_LIBS) $(LIBS) + $(STRIP) ssh-keygen + +ssh-agent: $(AGENT_OBJS) $(RSAREFDEP) + -rm -f ssh-agent + $(CC) $(LDFLAGS) -o ssh-agent $(AGENT_OBJS) $(GMPLIBS) $(KRB4_LIBS) $(LIBS) + $(STRIP) ssh-agent + +ssh-add: $(ADD_OBJS) $(RSAREFDEP) + -rm -f ssh-add + $(CC) $(LDFLAGS) -o ssh-add $(ADD_OBJS) $(GMPLIBS) $(KRB4_LIBS) $(LIBS) + $(STRIP) ssh-add + +scp: $(SCP_OBJS) $(LIBOBJS) + -rm -f scp + $(CC) $(LDFLAGS) -o scp $(SCP_OBJS) $(LIBOBJS) $(KRB4_LIBS) $(LIBS) + $(STRIP) scp + +ssh-fingerprint: $(FINGERPRINT_OBJS) + -rm -f ssh-fingerprint + $(CC) $(LDFLAGS) -o ssh-fingerprint $(FINGERPRINT_OBJS) $(GMPLIBS) $(LIBOBJS) $(LIBS) + $(STRIP) ssh-fingerprint + +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 + +$(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: ssh-keygen + -@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)$(libexec); then \ + mkdir $(install_prefix)$(libexec); 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! 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: install-programs install-etc generate-host-key + +install-programs: $(PROGRAMS) make-dirs + $(INSTALL_PROGRAM) -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 $(sbindir)/sshd to avoid confusion since it is now in $(libexec) + -rm -f $(install_prefix)$(sbindir)/sshd + -rm -f $(install_prefix)$(sbindir)/`echo sshd | sed '$(transform)'` + -for p in $(SBIN_PROGRAMS); do \ + $(INSTALL_PROGRAM) -m 0755 $$p $(install_prefix)$(libexec)/$$p; \ + if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \ + rm -f $(install_prefix)$(libexec)/`echo $$p | sed '$(transform)'`;\ + $(LN_S) $$p \ + $(install_prefix)$(libexec)/`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 + +install-etc: + -if test '!' -f $(install_prefix)$(HOST_CONFIG_FILE); then \ + $(INSTALL_DATA) -m 0644 $(srcdir)/ssh_config \ + $(install_prefix)$(HOST_CONFIG_FILE); fi + -if test '!' -f $(install_prefix)$(SERVER_CONFIG_FILE); then \ + cat $(srcdir)/sshd_config | \ + 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)$(libexec)/$$p; \ + rm -f $(install_prefix)$(libexec)/`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 gmon.out core $(PROGRAMS) 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 -Naur ossh-1.5.12.org/config.h ossh-1.5.12.new/config.h --- ossh-1.5.12.org/config.h Thu Jan 1 01:00:00 1970 +++ ossh-1.5.12.new/config.h Wed Mar 26 21:48:50 2003 @@ -0,0 +1,439 @@ +/* config.h. Generated automatically by configure. */ +/* 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 + +*/ + +#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 doesn't define. */ +/* #undef gid_t */ + +/* Define if your struct stat has st_blksize. */ +#define HAVE_ST_BLKSIZE 1 + +/* Define if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define as __inline if that's what the C compiler calls it. */ +/* #undef inline */ + +/* Define to `int' if 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 doesn't define. */ +/* #undef off_t */ + +/* Define as the return type of signal handlers (int or void). */ +#define RETSIGTYPE void + +/* 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 doesn't define. */ +/* #undef size_t */ + +/* Define if the `S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Define to `int' if 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/. */ +#define HAVE_DEV_PTMX 1 + +/* 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). */ +#define HAVE_ETC_SHADOW 1 + +/* 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. */ +/* #unde 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 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= 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 Blowfish encryption. */ +#define WITH_BLOWFISH 1 + +/* 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 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. */ +#define USE_PIPES 1 + +/* 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. */ +#define WITH_ZLIB 1 + +/* The number of bytes in a int. */ +#define SIZEOF_INT 4 + +/* The number of bytes in a long. */ +#define SIZEOF_LONG 4 + +/* The number of bytes in a short. */ +#define SIZEOF_SHORT 2 + +/* Define if you have the _getpty function. */ +/* #undef HAVE__GETPTY */ + +/* Define if you have the clock function. */ +#define HAVE_CLOCK 1 + +/* Define if you have the fchmod function. */ +#define HAVE_FCHMOD 1 + +/* Define if you have the getdtablesize function. */ +#define HAVE_GETDTABLESIZE 1 + +/* Define if you have the gethostname function. */ +#define HAVE_GETHOSTNAME 1 + +/* Define if you have the getrusage function. */ +#define HAVE_GETRUSAGE 1 + +/* Define if you have the gettimeofday function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define if you have the initgroups function. */ +#define HAVE_INITGROUPS 1 + +/* Define if you have the innetgr function. */ +/* #undef HAVE_INNETGR */ + +/* Define if you have the memcpy function. */ +#define HAVE_MEMCPY 1 + +/* Define if you have the memmove function. */ +#define HAVE_MEMMOVE 1 + +/* Define if you have the openpty function. */ +/* #undef HAVE_OPENPTY */ + +/* Define if you have the popen function. */ +#define HAVE_POPEN 1 + +/* Define if you have the putenv function. */ +#define HAVE_PUTENV 1 + +/* Define if you have the random function. */ +#define HAVE_RANDOM 1 + +/* Define if you have the remove function. */ +#define HAVE_REMOVE 1 + +/* 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 setresuid function. */ +#define HAVE_SETRESUID 1 + +/* Define if you have the setreuid function. */ +#define HAVE_SETREUID 1 + +/* Define if you have the setrlimit function. */ +#define HAVE_SETRLIMIT 1 + +/* Define if you have the setsid function. */ +#define HAVE_SETSID 1 + +/* Define if you have the socketpair function. */ +#define HAVE_SOCKETPAIR 1 + +/* Define if you have the strchr function. */ +#define HAVE_STRCHR 1 + +/* Define if you have the strerror function. */ +#define HAVE_STRERROR 1 + +/* Define if you have the times function. */ +#define HAVE_TIMES 1 + +/* 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 header file. */ +#define HAVE_DIRENT_H 1 + +/* Define if you have the header file. */ +#define HAVE_GMP_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_KRB_H */ + +/* Define if you have the header file. */ +/* #undef HAVE_LASTLOG_H */ + +/* Define if you have the header file. */ +/* #undef HAVE_NDIR_H */ + +/* Define if you have the header file. */ +#define HAVE_NETINET_IN_SYSTM_H 1 + +/* Define if you have the header file. */ +#define HAVE_PATHS_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_RUSAGE_H */ + +/* Define if you have the header file. */ +#define HAVE_SGTTY_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_CONF_H */ + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_FILIO_H */ + +/* Define if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_STREAM_H */ + +/* Define if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_ULIMIT_H */ + +/* Define if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_USERSEC_H */ + +/* Define if you have the header file. */ +#define HAVE_UTIME_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_UTMP_H */ + +/* Define if you have the header file. */ +/* #undef HAVE_UTMPX_H */ + +/* Define if you have the header file. */ +#define HAVE_ZLIB_H 1 + +/* Define if you have the crypt library (-lcrypt). */ +#define HAVE_LIBCRYPT 1 + +/* 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). */ +#define HAVE_LIBGMP 1 + +/* Define if you have the krb library (-lkrb). */ +/* #undef HAVE_LIBKRB */ + +/* Define if you have the nsl library (-lnsl). */ +#define HAVE_LIBNSL 1 + +/* 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). */ +#define HAVE_LIBZ 1 diff -Naur ossh-1.5.12.org/sshd.c ossh-1.5.12.new/sshd.c --- ossh-1.5.12.org/sshd.c Thu Jun 7 17:58:59 2001 +++ ossh-1.5.12.new/sshd.c Wed Mar 26 21:47:58 2003 @@ -1767,8 +1767,12 @@ int fromlen; struct pty_cleanup_context cleanup_context; +#ifndef NORESOLVING /* Get remote host name. */ hostname = get_canonical_hostname(); +#else + hostname = "unresolved"; +#endif /* Get the time when the user last logged in. Buf will be set to contain the hostname the last login was from. */