--- ./Makefile.in Sat Sep 13 18:40:36 2003 +++ ../openssh-3.7.1p2/./Makefile.in Thu Sep 18 13:43:00 2003 @@ -41,8 +41,8 @@ CC=@CC@ LD=@LD@ CFLAGS=@CFLAGS@ -CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ -LIBS=@LIBS@ +CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ $(EXTRA_FLAGS) +LIBS=@LIBS@ $(EXTRA_LIBS) LIBPAM=@LIBPAM@ LIBWRAP=@LIBWRAP@ AR=@AR@ --- ./defines.h Mon Sep 15 18:52:19 2003 +++ ../openssh-3.7.1p2/./defines.h Thu Sep 18 13:43:00 2003 @@ -76,6 +76,11 @@ #endif #endif +#ifdef NGROUPS_UMAX +#undef NGROUPS_MAX +#define NGROUPS_MAX NGROUPS_UMAX +#endif + #ifndef O_NONBLOCK /* Non Blocking Open */ # define O_NONBLOCK 00004 #endif --- ./includes.h Sun Jun 29 04:23:37 2003 +++ ../openssh-3.7.1p2/./includes.h Thu Sep 18 13:43:00 2003 @@ -19,6 +19,10 @@ #define RCSID(msg) \ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } +#ifdef SOCKS +# include +#endif + #include "config.h" #include --- ./scp.c Thu Aug 21 16:34:41 2003 +++ ../openssh-3.7.1p2/./scp.c Thu Sep 18 13:48:42 2003 @@ -222,6 +222,10 @@ extern char *optarg; extern int optind; +#ifdef SOCKS + SOCKSinit(argv[0]); +#endif + __progname = ssh_get_progname(argv[0]); args.list = NULL; --- ./sftp.c Thu Aug 21 16:34:41 2003 +++ ../openssh-3.7.1p2/./sftp.c Thu Sep 18 13:46:30 2003 @@ -131,6 +131,10 @@ arglist args; extern int optind; extern char *optarg; + +#ifdef SOCKS + SOCKSinit(argv[0]); +#endif __progname = ssh_get_progname(argv[0]); args.list = NULL; --- ./ssh.1 Sat Aug 2 05:24:50 2003 +++ ../openssh-3.7.1p2/./ssh.1 Thu Sep 18 13:43:00 2003 @@ -103,7 +103,7 @@ First, if the machine the user logs in from is listed in .Pa /etc/hosts.equiv or -.Pa /etc/shosts.equiv +.Pa /etc/ssh/shosts.equiv on the remote machine, and the user names are the same on both sides, the user is immediately permitted to log in. Second, if @@ -127,7 +127,7 @@ .Pa $HOME/.shosts , .Pa /etc/hosts.equiv , or -.Pa /etc/shosts.equiv , +.Pa /etc/ssh/shosts.equiv , and if additionally the server can verify the client's host key (see .Pa /etc/ssh/ssh_known_hosts @@ -935,7 +935,7 @@ Additionally, successful RSA host authentication is normally required. This file should only be writable by root. -.It Pa /etc/shosts.equiv +.It Pa /etc/ssh/shosts.equiv This file is processed exactly as .Pa /etc/hosts.equiv . This file may be useful to permit logins using --- ./ssh.c Tue Sep 2 05:58:22 2003 +++ ../openssh-3.7.1p2/./ssh.c Thu Sep 18 14:15:46 2003 @@ -211,6 +211,10 @@ extern int optind, optreset; extern char *optarg; +#ifdef SOCKS + SOCKSinit(av[0]); +#endif + __progname = ssh_get_progname(av[0]); init_rng(); --- ./ssh_config.5 Tue Sep 2 19:13:30 2003 +++ ../openssh-3.7.1p2/./ssh_config.5 Thu Sep 18 13:43:00 2003 @@ -632,7 +632,7 @@ .Xr xauth 1 program. The default is -.Pa /usr/X11R6/bin/xauth . +.Pa /usr/bin/X11/xauth . .El .Sh FILES .Bl -tag -width Ds --- ./ssh_prng_cmds.in Sun Jul 14 14:43:58 2002 +++ ../openssh-3.7.1p2/./ssh_prng_cmds.in Thu Sep 18 13:43:00 2003 @@ -13,6 +13,7 @@ "ls -alni /var/mail" @PROG_LS@ 0.02 "ls -alni /usr/mail" @PROG_LS@ 0.02 "ls -alni /var/adm/syslog" @PROG_LS@ 0.02 +"ls -alni /var/adm/SYSLOG" @PROG_LS@ 0.02 "ls -alni /usr/adm/syslog" @PROG_LS@ 0.02 "ls -alni /var/spool/mail" @PROG_LS@ 0.02 "ls -alni /proc" @PROG_LS@ 0.02 @@ -68,6 +69,7 @@ "tail -200 /var/log/syslog" @PROG_TAIL@ 0.01 "tail -200 /var/adm/messages" @PROG_TAIL@ 0.01 "tail -200 /var/adm/syslog" @PROG_TAIL@ 0.01 +"tail -200 /var/adm/SYSLOG" @PROG_TAIL@ 0.01 "tail -200 /var/adm/syslog/syslog.log" @PROG_TAIL@ 0.01 "tail -200 /var/log/maillog" @PROG_TAIL@ 0.01 "tail -200 /var/adm/maillog" @PROG_TAIL@ 0.01 --- ./sshd.8 Sun Aug 24 18:51:19 2003 +++ ../openssh-3.7.1p2/./sshd.8 Thu Sep 18 13:43:00 2003 @@ -626,7 +626,7 @@ during privilege separation in the pre-authentication phase. The directory should not contain any files and must be owned by root and not group or world-writable. -.It Pa /var/run/sshd.pid +.It Pa /etc/sshd.pid Contains the process ID of the .Nm listening for connections (if there are several daemons running @@ -727,7 +727,7 @@ of is in negative entries. .Pp Note that this warning also applies to rsh/rlogin. -.It Pa /etc/shosts.equiv +.It Pa /etc/ssh/shosts.equiv This is processed exactly as .Pa /etc/hosts.equiv . However, this file may be useful in environments that want to run both --- ./sshd_config.5 Tue Sep 2 05:57:05 2003 +++ ../openssh-3.7.1p2/./sshd_config.5 Thu Sep 18 13:43:00 2003 @@ -277,7 +277,7 @@ .Pp .Pa /etc/hosts.equiv and -.Pa /etc/shosts.equiv +.Pa /etc/ssh/shosts.equiv are still used. The default is .Dq yes . @@ -698,7 +698,7 @@ .Xr xauth 1 program. The default is -.Pa /usr/X11R6/bin/xauth . +.Pa /usr/bin/X11/xauth . .El .Ss Time Formats .Nm sshd --- ./openbsd-compat/port-irix.c Sat May 31 20:23:57 2003 +++ ../openssh-3.7.1p2/./openbsd-compat/port-irix.c Thu Sep 18 13:45:41 2003 @@ -34,6 +34,14 @@ #endif /* WITH_IRIX_PROJECT */ #ifdef WITH_IRIX_JOBS # include +#include +# if !defined(JLIMIT_CPU) +/* Simulate job limit support so we can still test for it at runtime. */ +typedef __int64_t jid_t; +extern jid_t jlimit_startjob(char *, uid_t, char *); +# pragma optional jlimit_startjob +# endif + #endif #ifdef WITH_IRIX_AUDIT # include @@ -52,10 +60,16 @@ #endif #ifdef WITH_IRIX_JOBS - jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive"); - if (jid == -1) - fatal("Failed to create job container: %.100s", - strerror(errno)); + if (_MIPS_SYMBOL_PRESENT(jlimit_startjob)) { + jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive"); + if (jid == -1) { + if (errno == ENOPKG) + jid = 0; + else + fatal("Failed to create job container: %.100s", + strerror(errno)); + } + } #endif /* WITH_IRIX_JOBS */ #ifdef WITH_IRIX_ARRAY /* initialize array session */ --- ./openbsd-compat/xmmap.c Sun Jun 1 19:25:27 2003 +++ ../openssh-3.7.1p2/./openbsd-compat/xmmap.c Thu Sep 18 13:43:01 2003 @@ -35,7 +35,7 @@ void *xmmap(size_t size) { - void *address; + void *address = MAP_FAILED; #ifdef HAVE_MMAP # ifdef MAP_ANON @@ -42,8 +42,11 @@ address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED, -1, 0); # else + int fd_zero = open("/dev/zero", O_RDWR); address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, - open("/dev/zero", O_RDWR), 0); + fd_zero, 0); + if (fd_zero != -1) + close(fd_zero); # endif #define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX" --- ./sshd_config.0 Mon Sep 15 23:13:37 2003 +++ ../openssh-3.7.1p2/./sshd_config.0 Thu Sep 18 13:48:09 2003 @@ -415,7 +415,7 @@ XAuthLocation Specifies the full pathname of the xauth(1) program. The default - is /usr/X11R6/bin/xauth. + is /usr/bin/X11/xauth. Time Formats sshd command-line arguments and configuration file options that specify --- ./ssh_config.0 Mon Sep 15 23:13:38 2003 +++ ../openssh-3.7.1p2/./ssh_config.0 Thu Sep 18 13:47:43 2003 @@ -379,7 +379,7 @@ XAuthLocation Specifies the full pathname of the xauth(1) program. The default - is /usr/X11R6/bin/xauth. + is /usr/bin/X11/xauth. FILES $HOME/.ssh/config