diff options
author | Damien Miller <djm@mindrot.org> | 2002-02-10 18:32:55 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-02-10 18:32:55 +1100 |
commit | afcc22542e97b2a8893b11a8c3f799ef95db9319 (patch) | |
tree | d49bda4cda8bc9532bda8eb0ac6afd987a2a8d8c | |
parent | 05eda437a64020e8d8a824bb1ae102603f59efb9 (diff) |
- deraadt@cvs.openbsd.org 2002/02/10 01:07:05
[readconf.h sshd.8]
more /etc/ssh; openbsd@davidkrause.com
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.h | 4 | ||||
-rw-r--r-- | sshd.8 | 4 |
3 files changed, 8 insertions, 5 deletions
@@ -4,6 +4,9 @@ | |||
4 | [pathnames.h session.c ssh.1 sshd.8 sshd_config ssh-keyscan.1] | 4 | [pathnames.h session.c ssh.1 sshd.8 sshd_config ssh-keyscan.1] |
5 | move ssh config files to /etc/ssh | 5 | move ssh config files to /etc/ssh |
6 | - (djm) Adjust portable Makefile.in tnd ssh-rand-helper.c o match | 6 | - (djm) Adjust portable Makefile.in tnd ssh-rand-helper.c o match |
7 | - deraadt@cvs.openbsd.org 2002/02/10 01:07:05 | ||
8 | [readconf.h sshd.8] | ||
9 | more /etc/ssh; openbsd@davidkrause.com | ||
7 | 10 | ||
8 | 20020208 | 11 | 20020208 |
9 | - (djm) OpenBSD CVS Sync | 12 | - (djm) OpenBSD CVS Sync |
@@ -7541,4 +7544,4 @@ | |||
7541 | - Wrote replacements for strlcpy and mkdtemp | 7544 | - Wrote replacements for strlcpy and mkdtemp |
7542 | - Released 1.0pre1 | 7545 | - Released 1.0pre1 |
7543 | 7546 | ||
7544 | $Id: ChangeLog,v 1.1837 2002/02/10 07:32:28 djm Exp $ | 7547 | $Id: ChangeLog,v 1.1838 2002/02/10 07:32:55 djm Exp $ |
diff --git a/readconf.h b/readconf.h index 25ffa4668..b1f01734d 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -11,7 +11,7 @@ | |||
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 | 13 | ||
14 | /* RCSID("$OpenBSD: readconf.h,v 1.40 2001/10/01 21:51:16 markus Exp $"); */ | 14 | /* RCSID("$OpenBSD: readconf.h,v 1.41 2002/02/10 01:07:05 deraadt Exp $"); */ |
15 | 15 | ||
16 | #ifndef READCONF_H | 16 | #ifndef READCONF_H |
17 | #define READCONF_H | 17 | #define READCONF_H |
@@ -81,7 +81,7 @@ typedef struct { | |||
81 | char *user; /* User to log in as. */ | 81 | char *user; /* User to log in as. */ |
82 | int escape_char; /* Escape character; -2 = none */ | 82 | int escape_char; /* Escape character; -2 = none */ |
83 | 83 | ||
84 | char *system_hostfile;/* Path for /etc/ssh_known_hosts. */ | 84 | char *system_hostfile;/* Path for /etc/ssh/ssh_known_hosts. */ |
85 | char *user_hostfile; /* Path for $HOME/.ssh/known_hosts. */ | 85 | char *user_hostfile; /* Path for $HOME/.ssh/known_hosts. */ |
86 | char *system_hostfile2; | 86 | char *system_hostfile2; |
87 | char *user_hostfile2; | 87 | char *user_hostfile2; |
@@ -34,7 +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.167 2002/02/09 17:37:34 deraadt Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.168 2002/02/10 01:07:05 deraadt Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -966,7 +966,7 @@ Changes to user's home directory. | |||
966 | If | 966 | If |
967 | .Pa $HOME/.ssh/rc | 967 | .Pa $HOME/.ssh/rc |
968 | exists, runs it; else if | 968 | exists, runs it; else if |
969 | .Pa /etc/sshrc | 969 | .Pa /etc/ssh/sshrc |
970 | exists, runs | 970 | exists, runs |
971 | it; otherwise runs xauth. | 971 | it; otherwise runs xauth. |
972 | The | 972 | The |