diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | RFC.nroff | 2 | ||||
-rw-r--r-- | auth-options.h | 3 | ||||
-rw-r--r-- | authfile.h | 4 | ||||
-rw-r--r-- | cli.c | 2 | ||||
-rw-r--r-- | cli.h | 2 | ||||
-rw-r--r-- | scp.1 | 2 | ||||
-rw-r--r-- | sshd.8 | 1 | ||||
-rw-r--r-- | version.h | 2 |
9 files changed, 16 insertions, 3 deletions
@@ -1,5 +1,6 @@ | |||
1 | 20001106 | 1 | 20001106 |
2 | - (djm) Use Jim's new 1.0.3 askpass in Redhat RPMs | 2 | - (djm) Use Jim's new 1.0.3 askpass in Redhat RPMs |
3 | - (djm) Manually fix up missed diff hunks (mainly RCS idents) | ||
3 | 4 | ||
4 | 20001105 | 5 | 20001105 |
5 | - (bal) Sync with OpenBSD: | 6 | - (bal) Sync with OpenBSD: |
@@ -1,6 +1,6 @@ | |||
1 | .\" -*- nroff -*- | 1 | .\" -*- nroff -*- |
2 | .\" | 2 | .\" |
3 | .\" $Id: RFC.nroff,v 1.1 1999/10/27 03:42:43 damien Exp $ | 3 | .\" $OpenBSD: RFC.nroff,v 1.2 2000/10/16 09:38:44 djm Exp $ |
4 | .\" | 4 | .\" |
5 | .pl 10.0i | 5 | .pl 10.0i |
6 | .po 0 | 6 | .po 0 |
diff --git a/auth-options.h b/auth-options.h index 02ac5df1d..00fae2230 100644 --- a/auth-options.h +++ b/auth-options.h | |||
@@ -10,6 +10,9 @@ | |||
10 | * incompatible with the protocol description in the RFC file, it must be | 10 | * incompatible with the protocol description in the RFC file, it must be |
11 | * called by a name other than "ssh" or "Secure Shell". | 11 | * called by a name other than "ssh" or "Secure Shell". |
12 | */ | 12 | */ |
13 | |||
14 | /* $OpenBSD: auth-options.h,v 1.5 2000/10/16 09:38:44 djm Exp $ */ | ||
15 | |||
13 | #ifndef AUTH_OPTIONS_H | 16 | #ifndef AUTH_OPTIONS_H |
14 | #define AUTH_OPTIONS_H | 17 | #define AUTH_OPTIONS_H |
15 | /* Flags that may be set in authorized_keys options. */ | 18 | /* Flags that may be set in authorized_keys options. */ |
diff --git a/authfile.h b/authfile.h index 4283d9381..525b4aa5b 100644 --- a/authfile.h +++ b/authfile.h | |||
@@ -10,9 +10,13 @@ | |||
10 | * incompatible with the protocol description in the RFC file, it must be | 10 | * incompatible with the protocol description in the RFC file, it must be |
11 | * called by a name other than "ssh" or "Secure Shell". | 11 | * called by a name other than "ssh" or "Secure Shell". |
12 | */ | 12 | */ |
13 | |||
14 | /* $OpenBSD: authfile.h,v 1.5 2000/10/16 09:38:44 djm Exp $ */ | ||
15 | |||
13 | #ifndef AUTHFILE_H | 16 | #ifndef AUTHFILE_H |
14 | #define AUTHFILE_H | 17 | #define AUTHFILE_H |
15 | 18 | ||
19 | |||
16 | /* | 20 | /* |
17 | * Saves the authentication (private) key in a file, encrypting it with | 21 | * Saves the authentication (private) key in a file, encrypting it with |
18 | * passphrase. | 22 | * passphrase. |
@@ -1,5 +1,5 @@ | |||
1 | #include "includes.h" | 1 | #include "includes.h" |
2 | RCSID("$Id: cli.c,v 1.1 2000/10/14 05:23:12 djm Exp $"); | 2 | RCSID("$OpenBSD: cli.c,v 1.2 2000/10/16 09:38:44 djm Exp $"); |
3 | 3 | ||
4 | #include "xmalloc.h" | 4 | #include "xmalloc.h" |
5 | #include "ssh.h" | 5 | #include "ssh.h" |
@@ -1,3 +1,5 @@ | |||
1 | /* $OpenBSD: cli.h,v 1.2 2000/10/16 09:38:44 djm Exp $ */ | ||
2 | |||
1 | #ifndef CLI_H | 3 | #ifndef CLI_H |
2 | #define CLI_H | 4 | #define CLI_H |
3 | 5 | ||
@@ -9,7 +9,7 @@ | |||
9 | .\" | 9 | .\" |
10 | .\" Created: Sun May 7 00:14:37 1995 ylo | 10 | .\" Created: Sun May 7 00:14:37 1995 ylo |
11 | .\" | 11 | .\" |
12 | .\" $Id: scp.1,v 1.11 2000/10/14 05:23:12 djm Exp $ | 12 | .\" $OpenBSD: scp.1,v 1.13 2000/10/16 09:38:44 djm Exp $ |
13 | .\" | 13 | .\" |
14 | .Dd September 25, 1999 | 14 | .Dd September 25, 1999 |
15 | .Dt SCP 1 | 15 | .Dt SCP 1 |
@@ -34,6 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd.8,v 1.70 2000/10/16 09:38:44 djm Exp $ | ||
37 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
38 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
39 | .Os | 40 | .Os |
@@ -1 +1,3 @@ | |||
1 | /* $OpenBSD: version.h,v 1.13 2000/10/16 09:38:45 djm Exp $ */ | ||
2 | |||
1 | #define SSH_VERSION "OpenSSH_2.3.0p1" | 3 | #define SSH_VERSION "OpenSSH_2.3.0p1" |