- (djm) Manually fix up missed diff hunks (mainly RCS idents)

diff --git a/ChangeLog b/ChangeLog
index 611dc5e3826198b649974f91602cf93ec21916de..78c5bc892e606cd7bc94bf0aed2d79460e109be5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 20001106
  - (djm) Use Jim's new 1.0.3 askpass in Redhat RPMs
+ - (djm) Manually fix up missed diff hunks (mainly RCS idents)
 
 20001105
  - (bal) Sync with OpenBSD:

diff --git a/RFC.nroff b/RFC.nroff
index 8946ad24dcfde77c8a8d0dc158c90250659655c5..bf7146a70f29342314c6eb3244bbe2a2f03c6c6a 100644 (file)
--- a/RFC.nroff
+++ b/RFC.nroff
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\"
-.\" $Id$
+.\" $OpenBSD: RFC.nroff,v 1.2 2000/10/16 09:38:44 djm Exp $
 .\"
 .pl 10.0i
 .po 0

diff --git a/auth-options.h b/auth-options.h
index 02ac5df1d1e89a21d43dfc78ddb743f025a8b285..00fae22307d1c193926f58e9aae3bc39dec50c5c 100644 (file)
--- a/auth-options.h
+++ b/auth-options.h
@@ -10,6 +10,9 @@
  * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".
  */
+
+/* $OpenBSD: auth-options.h,v 1.5 2000/10/16 09:38:44 djm Exp $ */
+
 #ifndef AUTH_OPTIONS_H
 #define AUTH_OPTIONS_H
 /* Flags that may be set in authorized_keys options. */

diff --git a/authfile.h b/authfile.h
index 4283d9381c06792d8e02e2e290518cc64beab4ff..525b4aa5bdbd5d0aa6830eb51a1e8b9919c5d7bf 100644 (file)
--- a/authfile.h
+++ b/authfile.h
@@ -10,9 +10,13 @@
  * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".
  */
+
+/* $OpenBSD: authfile.h,v 1.5 2000/10/16 09:38:44 djm Exp $ */
+
 #ifndef AUTHFILE_H
 #define AUTHFILE_H
 
+
 /*
  * Saves the authentication (private) key in a file, encrypting it with
  * passphrase.

diff --git a/cli.c b/cli.c
index abe3f7c45ab537ba04d0dbea3f7a52133ccb50a2..27d0d9e18cbc861b48ab746f24bad94527f7e334 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -1,5 +1,5 @@
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: cli.c,v 1.2 2000/10/16 09:38:44 djm Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"

diff --git a/cli.h b/cli.h
index e33ce4a5047004111fbb9ef494006a93238c82b0..c4194046a26c3dad29c987ef6a31718578abd263 100644 (file)
--- a/cli.h
+++ b/cli.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: cli.h,v 1.2 2000/10/16 09:38:44 djm Exp $ */
+
 #ifndef CLI_H
 #define CLI_H
 

diff --git a/scp.1 b/scp.1
index eb02837de78c1fa47bf259e151953f47da3a6f22..0a2ca1a3445b2f238622c41800e9656dc4ecb87e 100644 (file)
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $Id$
+.\" $OpenBSD: scp.1,v 1.13 2000/10/16 09:38:44 djm Exp $
 .\"
 .Dd September 25, 1999
 .Dt SCP 1

diff --git a/sshd.8 b/sshd.8
index a474d2fd15486841b4906ac557c432dfeacebc76..e53eebe82a8fad02762bdff48c6a5e352966cc9f 100644 (file)
--- a/sshd.8
+++ b/sshd.8
@@ -34,6 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
+.\" $OpenBSD: sshd.8,v 1.70 2000/10/16 09:38:44 djm Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os

diff --git a/version.h b/version.h
index 3522a327cb85e2225f740878a28c176b5865ce11..cc8e7c3d6baecad45f5aeb429d264e9b492f9e1c 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1 +1,3 @@
+/* $OpenBSD: version.h,v 1.13 2000/10/16 09:38:45 djm Exp $ */
+
 #define SSH_VERSION    "OpenSSH_2.3.0p1"