summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-02-10 18:32:55 +1100
committerDamien Miller <djm@mindrot.org>2002-02-10 18:32:55 +1100
commitafcc22542e97b2a8893b11a8c3f799ef95db9319 (patch)
treed49bda4cda8bc9532bda8eb0ac6afd987a2a8d8c
parent05eda437a64020e8d8a824bb1ae102603f59efb9 (diff)
- deraadt@cvs.openbsd.org 2002/02/10 01:07:05
[readconf.h sshd.8] more /etc/ssh; openbsd@davidkrause.com
-rw-r--r--ChangeLog5
-rw-r--r--readconf.h4
-rw-r--r--sshd.84
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9936026b..e22fa7ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
[pathnames.h session.c ssh.1 sshd.8 sshd_config ssh-keyscan.1]
move ssh config files to /etc/ssh
- (djm) Adjust portable Makefile.in tnd ssh-rand-helper.c o match
+ - deraadt@cvs.openbsd.org 2002/02/10 01:07:05
+ [readconf.h sshd.8]
+ more /etc/ssh; openbsd@davidkrause.com
20020208
- (djm) OpenBSD CVS Sync
@@ -7541,4 +7544,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1837 2002/02/10 07:32:28 djm Exp $
+$Id: ChangeLog,v 1.1838 2002/02/10 07:32:55 djm Exp $
diff --git a/readconf.h b/readconf.h
index 25ffa466..b1f01734 100644
--- a/readconf.h
+++ b/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/sshd.8 b/sshd.8
index ca024a56..cf741099 100644
--- a/sshd.8
+++ b/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
@@ -966,7 +966,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