summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-11-06 12:39:34 +1100
committerDamien Miller <djm@mindrot.org>2000-11-06 12:39:34 +1100
commit389edc4ce4f96ae1e8066a8d9f97d062b88e94ce (patch)
treea52c3a8e71ad51aeaf4e4e213772df89368c1ef3
parentc78abaa1090f7da97ee8a6462830698bf66b23f1 (diff)
- (djm) Manually fix up missed diff hunks (mainly RCS idents)
-rw-r--r--ChangeLog1
-rw-r--r--RFC.nroff2
-rw-r--r--auth-options.h3
-rw-r--r--authfile.h4
-rw-r--r--cli.c2
-rw-r--r--cli.h2
-rw-r--r--scp.12
-rw-r--r--sshd.81
-rw-r--r--version.h2
9 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 611dc5e3..78c5bc89 100644
--- 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 cc197aaf..bf7146a7 100644
--- a/RFC.nroff
+++ b/RFC.nroff
@@ -1,6 +1,6 @@
.\" -*- nroff -*-
.\"
-.\" $Id: RFC.nroff,v 1.1 1999/10/27 03:42:43 damien Exp $
+.\" $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 02ac5df1..00fae223 100644
--- 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 4283d938..525b4aa5 100644
--- 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 7814a618..27d0d9e1 100644
--- a/cli.c
+++ b/cli.c
@@ -1,5 +1,5 @@
#include "includes.h"
-RCSID("$Id: cli.c,v 1.1 2000/10/14 05:23:12 djm Exp $");
+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 e33ce4a5..c4194046 100644
--- 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 f92ba447..0a2ca1a3 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $Id: scp.1,v 1.11 2000/10/14 05:23:12 djm Exp $
+.\" $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 a474d2fd..e53eebe8 100644
--- 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 3522a327..cc8e7c3d 100644
--- 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"