summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-02-10 01:07:06 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-02-10 01:07:06 +0000
commitebb4309988958d11d5d9f4141fb604a54ab48521 (patch)
tree7c637897d2be6d87ba4533bbc95d2d47d00547d4 /usr.bin/ssh
parent2781dc37153145e0b4bd51b2abf0ddbee094699a (diff)
more /etc/ssh; openbsd@davidkrause.com
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/readconf.h4
-rw-r--r--usr.bin/ssh/sshd.84
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/readconf.h b/usr.bin/ssh/readconf.h
index 25ffa4668b4..b1f01734d6a 100644
--- a/usr.bin/ssh/readconf.h
+++ b/usr.bin/ssh/readconf.h
@@ -11,7 +11,7 @@
* called by a name other than "ssh" or "Secure Shell".
*/
-/* RCSID("$OpenBSD: readconf.h,v 1.40 2001/10/01 21:51:16 markus Exp $"); */
+/* RCSID("$OpenBSD: readconf.h,v 1.41 2002/02/10 01:07:05 deraadt Exp $"); */
#ifndef READCONF_H
#define READCONF_H
@@ -81,7 +81,7 @@ typedef struct {
char *user; /* User to log in as. */
int escape_char; /* Escape character; -2 = none */
- char *system_hostfile;/* Path for /etc/ssh_known_hosts. */
+ char *system_hostfile;/* Path for /etc/ssh/ssh_known_hosts. */
char *user_hostfile; /* Path for $HOME/.ssh/known_hosts. */
char *system_hostfile2;
char *user_hostfile2;
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index 78d3e68e2e4..e8f46d06b26 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -34,7 +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.167 2002/02/09 17:37:34 deraadt Exp $
+.\" $OpenBSD: sshd.8,v 1.168 2002/02/10 01:07:05 deraadt Exp $
.Dd September 25, 1999
.Dt SSHD 8
.Os
@@ -958,7 +958,7 @@ Changes to user's home directory.
If
.Pa $HOME/.ssh/rc
exists, runs it; else if
-.Pa /etc/sshrc
+.Pa /etc/ssh/sshrc
exists, runs
it; otherwise runs xauth.
The