[src/trunk]: src/crypto/dist/ssh Deal with lossage caused by the addition of ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/81aa839cfa1b
branches:  trunk
changeset: 519229:81aa839cfa1b
user:      he <he%NetBSD.org@localhost>
date:      Thu Dec 13 15:53:54 2001 +0000

description:
Deal with lossage caused by the addition of the netbsd-1-5 branch tag
to these files.

Apparently, the "magic" which causes the latest version on the
vendor branch to appear at the head in the repository broke when
the netbsd-1-5 tag was added.  Thus, merge in the lost revisions from
the vendor tag to work around this.

diffstat:

 crypto/dist/ssh/scard.c    |  2 +-
 crypto/dist/ssh/sshlogin.c |  2 +-
 crypto/dist/ssh/sshlogin.h |  2 +-
 crypto/dist/ssh/sshpty.h   |  2 +-
 crypto/dist/ssh/sshtty.h   |  2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r e9bc35352a8e -r 81aa839cfa1b crypto/dist/ssh/scard.c
--- a/crypto/dist/ssh/scard.c   Thu Dec 13 15:09:07 2001 +0000
+++ b/crypto/dist/ssh/scard.c   Thu Dec 13 15:53:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scard.c,v 1.1.1.2 2001/11/07 06:20:12 itojun Exp $     */
+/*     $NetBSD: scard.c,v 1.2 2001/12/13 15:53:54 he Exp $     */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
diff -r e9bc35352a8e -r 81aa839cfa1b crypto/dist/ssh/sshlogin.c
--- a/crypto/dist/ssh/sshlogin.c        Thu Dec 13 15:09:07 2001 +0000
+++ b/crypto/dist/ssh/sshlogin.c        Thu Dec 13 15:53:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sshlogin.c,v 1.1.1.2 2001/04/10 07:14:22 itojun Exp $  */
+/*     $NetBSD: sshlogin.c,v 1.2 2001/12/13 15:53:54 he Exp $  */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
  * Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
diff -r e9bc35352a8e -r 81aa839cfa1b crypto/dist/ssh/sshlogin.h
--- a/crypto/dist/ssh/sshlogin.h        Thu Dec 13 15:09:07 2001 +0000
+++ b/crypto/dist/ssh/sshlogin.h        Thu Dec 13 15:53:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sshlogin.h,v 1.1.1.3 2001/09/27 02:01:01 itojun Exp $  */
+/*     $NetBSD: sshlogin.h,v 1.2 2001/12/13 15:53:54 he Exp $  */
 /*     $OpenBSD: sshlogin.h,v 1.3 2001/06/26 17:27:25 markus Exp $     */
 
 /*
diff -r e9bc35352a8e -r 81aa839cfa1b crypto/dist/ssh/sshpty.h
--- a/crypto/dist/ssh/sshpty.h  Thu Dec 13 15:09:07 2001 +0000
+++ b/crypto/dist/ssh/sshpty.h  Thu Dec 13 15:53:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sshpty.h,v 1.1.1.3 2001/09/27 02:01:02 itojun Exp $    */
+/*     $NetBSD: sshpty.h,v 1.2 2001/12/13 15:53:54 he Exp $    */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
  * Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
diff -r e9bc35352a8e -r 81aa839cfa1b crypto/dist/ssh/sshtty.h
--- a/crypto/dist/ssh/sshtty.h  Thu Dec 13 15:09:07 2001 +0000
+++ b/crypto/dist/ssh/sshtty.h  Thu Dec 13 15:53:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sshtty.h,v 1.1.1.2 2001/09/27 02:01:02 itojun Exp $    */
+/*     $NetBSD: sshtty.h,v 1.2 2001/12/13 15:53:54 he Exp $    */
 /* $OpenBSD: sshtty.h,v 1.2 2001/06/26 17:27:25 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>