head	1.11;
access;
symbols
	RELEASE_4_5_0:1.10
	RELEASE_4_4_0:1.10
	RELEASE_4_3_0:1.9
	RELEASE_4_2_0:1.9
	RELEASE_4_1_1:1.9
	RELEASE_4_1_0:1.9
	RELEASE_3_5_0:1.8
	RELEASE_4_0_0:1.6
	RELEASE_3_4_0:1.3
	openssh_1_2:1.1.1.1
	OPENBSD:1.1.1;
locks; strict;
comment	@# @;


1.11
date	2002.03.12.17.54.07;	author dinoex;	state dead;
branches;
next	1.10;

1.10
date	2001.06.08.08.03.26;	author dinoex;	state Exp;
branches;
next	1.9;

1.9
date	2000.06.27.21.30.39;	author green;	state Exp;
branches;
next	1.8;

1.8
date	2000.05.20.05.09.04;	author green;	state Exp;
branches;
next	1.7;

1.7
date	2000.05.13.19.25.57;	author green;	state Exp;
branches;
next	1.6;

1.6
date	2000.03.03.06.10.09;	author green;	state Exp;
branches;
next	1.5;

1.5
date	2000.02.27.20.07.10;	author shin;	state Exp;
branches;
next	1.4;

1.4
date	2000.02.19.16.50.55;	author shin;	state Exp;
branches;
next	1.3;

1.3
date	99.11.24.03.36.21;	author green;	state Exp;
branches;
next	1.2;

1.2
date	99.11.13.23.37.58;	author green;	state Exp;
branches;
next	1.1;

1.1
date	99.11.08.06.20.52;	author green;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.11.08.06.20.52;	author green;	state Exp;
branches;
next	;


desc
@@


1.11
log
@Rename Patches to make navigation much more easier.
@
text
@--- ssh.c.orig	Tue Apr 17 14:55:04 2001
+++ ssh.c	Sat May 26 15:05:28 2001
@@@@ -199,6 +199,9 @@@@
 	log("Using rsh.  WARNING: Connection will not be encrypted.");
 	/* Build argument list for rsh. */
 	i = 0;
+#ifndef	_PATH_RSH
+#define	_PATH_RSH	"/usr/bin/rsh"
+#endif
 	args[i++] = _PATH_RSH;
 	/* host may have to come after user on some systems */
 	args[i++] = host;
@


1.10
log
@- Update from OpenSSH 2.2.0 to OpenSSH 2.9
- Features:
  Possible use of sftp/sftp-server with older FreeBSD releases.
  Use a newer version independently from the Base system.
  Easier to test and fix possible security bugs.
- Bugs:
  build of pam_ssm.so isn't be supported any more
  Any file named "cookie" can be deleted by this and any older "sshd"
  with X11 Forwarding.
@
text
@@


1.9
log
@Update to OpenSSH 2.1.1 and fix SSHv2 serving (passwd botch).
@
text
@d1 3
a3 3
--- ssh.c.orig	Tue May 30 23:36:40 2000
+++ ssh.c	Tue Jun 20 16:15:29 2000
@@@@ -156,6 +156,9 @@@@
a12 12
@@@@ -482,6 +485,11 @@@@
 	pwcopy.pw_gid = pw->pw_gid;
 	pwcopy.pw_dir = xstrdup(pw->pw_dir);
 	pwcopy.pw_shell = xstrdup(pw->pw_shell);
+#ifdef __FreeBSD__
+	pwcopy.pw_class = xstrdup(pw->pw_class);
+ 	pwcopy.pw_expire = pw->pw_expire;
+ 	pwcopy.pw_change = pw->pw_change;
+#endif /* __FreeBSD__ */
 	pw = &pwcopy;
 
 	/* Initialize "log" output.  Since we are the client all output
@


1.8
log
@Fix this for OpenSSL versions <= 0.9.4.  It seems that the OpenSSH people
think that it's good to immediately switch to the newest API, despite
the old API call being left deliberately compatible so that that wouldn't
have to happen.   OpenSSL_add_all_algorithms() is now, again,
SSLeay_add_all_algorithms.
@
text
@d1 3
a3 3
--- ssh.c.orig	Mon May  8 13:12:15 2000
+++ ssh.c	Sat May 20 01:02:44 2000
@@@@ -154,6 +154,9 @@@@
d13 1
a13 10
@@@@ -422,7 +425,7 @@@@
 	if (!host)
 		usage();
 
-        OpenSSL_add_all_algorithms();
+        SSLeay_add_all_algorithms();
 
 	/* Initialize the command to execute on remote host. */
 	buffer_init(&command);
@@@@ -477,6 +480,11 @@@@
@


1.7
log
@Fix a mistake with pwcopy-related patches.
@
text
@d2 1
a2 1
+++ ssh.c	Sat May 13 15:17:33 2000
d13 9
@


1.6
log
@Update this to a CVS_DATE of a few minutes ago.
@
text
@d1 3
a3 3
--- ssh.c.orig	Sat Feb 19 23:57:54 2000
+++ ssh.c	Mon Feb 28 04:49:22 2000
@@@@ -131,6 +131,9 @@@@
d13 12
@


1.5
log
@Woops fix my previous incorrect patch.

For green's honor, the patch I sent him for review was correct.
But because it is one line fix, I hand merged it into my
cvs committing environment, and then mistake happend.

This time, I applied correct fix which should have been aplied
at last commit.
@
text
@a12 9
@@@@ -489,7 +492,7 @@@@
 		struct addrinfo *ai = NULL;
 		int errgai;
 		memset(&hints, 0, sizeof(hints));
-		hints.ai_family = AF_UNSPEC;
+		hints.ai_family = IPv4or6;
 		hints.ai_flags = AI_CANONNAME;
 		hints.ai_socktype = SOCK_STREAM;
 		errgai = getaddrinfo(host, NULL, &hints, &ai);
@


1.4
log
@Use 'IPv4or6' instead of AF_UNSPEC for 1st getaddrinfo() ai_family.

  Without this fix, still query to AAAA recored happens even if
  -4 options is specified.

Reviewed by: green
@
text
@d1 2
a2 2
--- ssh.c.orig	Sat Feb 19 02:39:02 2000
+++ ssh.c	Sat Feb 19 23:47:33 2000
d13 2
a14 1
@@@@ -490,7 +493,7 @@@@
d17 3
a19 3
 		hints.ai_family = AF_UNSPEC;
-		hints.ai_flags = AI_CANONNAME;
+		hints.ai_flags = IPv4or6;
a21 1
 		if (errgai == 0) {
@


1.3
log
@Update the CVS_DATE.  This brings in support for TIS authentication,
obsoleting a couple patches (it's the same code, though, except for
additions).

This also brings in KNFization of everything (please hold the cheering
down :) and made me reroll all my patches.

My patches have been almost entirely rewritten.  The places are the
same, but the code's rewritten.  It fits with the style (KNF) now,
and looks better.

I've also added strlcat.c to the build, which, just like strlcpy.c, is
necessary for compatibility with older libcs.  After strlcat() snuck
into the OpenSSH code recently, this would prevent OpenSSH from
building on (e.g.) FreeBSD 3.2.  Adding it to ssh/lib/ makes it work
yet again :)
@
text
@d1 3
a3 3
--- /usr/ports/distfiles/OpenSSH-1.2/src/usr.bin/ssh/ssh.c	Tue Nov 23 18:57:50 1999
+++ ./ssh.c	Tue Nov 23 19:28:33 1999
@@@@ -123,6 +123,9 @@@@
d13 9
@


1.2
log
@Add support for setting login.conf class things including rlimits, priority,
and umask.  Also support /var/run/nologin, copyright, and support motd
correctly.  The PR was used as a base, thanks!

PR:	14859
Submitted by:	Dan Harnett <danh@@wzrd.com>
@
text
@d1 8
a8 10
--- ./login.c.orig	Sat Nov 13 16:50:45 1999
+++ ./login.c	Sat Nov 13 17:59:23 1999
@@@@ -20,7 +20,11 @@@@
 #include "includes.h"
 RCSID("$Id: login.c,v 1.7 1999/09/30 16:55:06 deraadt Exp $");
 
+#if defined(__FreeBSD__)
+#include <libutil.h>
+#else
 #include <util.h>
d10 3
a12 3
 #include <utmp.h>
 #include "ssh.h"
 
@


1.1
log
@Initial revision
@
text
@d1 3
a3 4
diff -ru /home/green/ssh/login.c ./login.c
--- /home/green/ssh/login.c	Fri Oct  1 03:42:00 1999
+++ ./login.c	Mon Nov  8 00:06:40 1999
@@@@ -20,7 +20,6 @@@@
d7 5
a11 1
-#include <util.h>
@


1.1.1.1
log
@Say hello to OpenSSH!  It's more secure, has a better license, and
is actively maintained by members of the OpenBSD project.
@
text
@@
