summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--misc.c2
-rw-r--r--ssh-add.12
-rw-r--r--ssh-agent.13
-rw-r--r--ssh-keygen.12
-rw-r--r--uuencode.c4
6 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d4fb24213..6d4b87433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -101,6 +101,7 @@
101 - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD 101 - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD
102 - (bal) sftp-sever.c '%8lld' to '%8llu' (OpenBSD Sync) 102 - (bal) sftp-sever.c '%8lld' to '%8llu' (OpenBSD Sync)
103 - (bal) uuencode.c resync w/ OpenBSD tree, plus whitespace. 103 - (bal) uuencode.c resync w/ OpenBSD tree, plus whitespace.
104 - (bal) A bit more whitespace cleanup
104 105
10520010210 10620010210
106 - (djm) Sync sftp and scp stuff from OpenBSD: 107 - (djm) Sync sftp and scp stuff from OpenBSD:
@@ -3884,4 +3885,4 @@
3884 - Wrote replacements for strlcpy and mkdtemp 3885 - Wrote replacements for strlcpy and mkdtemp
3885 - Released 1.0pre1 3886 - Released 1.0pre1
3886 3887
3887$Id: ChangeLog,v 1.737 2001/02/10 23:44:47 mouring Exp $ 3888$Id: ChangeLog,v 1.738 2001/02/10 23:56:35 mouring Exp $
diff --git a/misc.c b/misc.c
index 344614fc7..d93502ba2 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.1 2001/01/21 19:05:52 markus Exp $ */ 1/* $OpenBSD: misc.c,v 1.1 2001/01/21 19:05:52 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
diff --git a/ssh-add.1 b/ssh-add.1
index da119b072..f4c97cef9 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -131,4 +131,4 @@ protocol versions 1.5 and 2.0.
131.Xr ssh 1 , 131.Xr ssh 1 ,
132.Xr ssh-agent 1 , 132.Xr ssh-agent 1 ,
133.Xr ssh-keygen 1 , 133.Xr ssh-keygen 1 ,
134.Xr sshd 8 134.Xr sshd 8
diff --git a/ssh-agent.1 b/ssh-agent.1
index d2f7a0aa0..d1a4a47a8 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -173,5 +173,4 @@ protocol versions 1.5 and 2.0.
173.Xr ssh 1 , 173.Xr ssh 1 ,
174.Xr ssh-add 1 , 174.Xr ssh-add 1 ,
175.Xr ssh-keygen 1 , 175.Xr ssh-keygen 1 ,
176.Xr sshd 8 , 176.Xr sshd 8
177.Xr ssl 8
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 38bca30c6..6661bfb10 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.30 2001/02/08 19:22:38 itojun Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.30 2001/02/08 19:22:38 itojun Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
diff --git a/uuencode.c b/uuencode.c
index 5d93e0b61..6637d107a 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $ */ 1/* $OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -28,6 +28,8 @@
28#include "xmalloc.h" 28#include "xmalloc.h"
29#include "uuencode.h" 29#include "uuencode.h"
30 30
31#include <resolv.h>
32
31RCSID("$OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $"); 33RCSID("$OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $");
32 34
33int 35int