diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | pathnames.h | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -24,6 +24,9 @@ | |||
24 | [ssh-keyscan.1] | 24 | [ssh-keyscan.1] |
25 | fix example, default key type is rsa for 3+ years; from | 25 | fix example, default key type is rsa for 3+ years; from |
26 | frederic.perrin@resel.fr | 26 | frederic.perrin@resel.fr |
27 | - stevesk@cvs.openbsd.org 2008/12/29 02:23:26 | ||
28 | [pathnames.h] | ||
29 | no need to escape single quotes in comments | ||
27 | 30 | ||
28 | 20090107 | 31 | 20090107 |
29 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. | 32 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. |
@@ -5033,5 +5036,5 @@ | |||
5033 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 5036 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
5034 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 5037 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
5035 | 5038 | ||
5036 | $Id: ChangeLog,v 1.5166 2009/01/28 05:18:03 djm Exp $ | 5039 | $Id: ChangeLog,v 1.5167 2009/01/28 05:19:52 djm Exp $ |
5037 | 5040 | ||
diff --git a/pathnames.h b/pathnames.h index f2571e274..80c5d9cbb 100644 --- a/pathnames.h +++ b/pathnames.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pathnames.h,v 1.16 2006/03/25 22:22:43 djm Exp $ */ | 1 | /* $OpenBSD: pathnames.h,v 1.17 2008/12/29 02:23:26 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -54,7 +54,7 @@ | |||
54 | #define _PATH_SSH_DAEMON_PID_FILE _PATH_SSH_PIDDIR "/sshd.pid" | 54 | #define _PATH_SSH_DAEMON_PID_FILE _PATH_SSH_PIDDIR "/sshd.pid" |
55 | 55 | ||
56 | /* | 56 | /* |
57 | * The directory in user\'s home directory in which the files reside. The | 57 | * The directory in user's home directory in which the files reside. The |
58 | * directory should be world-readable (though not all files are). | 58 | * directory should be world-readable (though not all files are). |
59 | */ | 59 | */ |
60 | #define _PATH_SSH_USER_DIR ".ssh" | 60 | #define _PATH_SSH_USER_DIR ".ssh" |
@@ -77,9 +77,9 @@ | |||
77 | #define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" | 77 | #define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" |
78 | 78 | ||
79 | /* | 79 | /* |
80 | * Configuration file in user\'s home directory. This file need not be | 80 | * Configuration file in user's home directory. This file need not be |
81 | * readable by anyone but the user him/herself, but does not contain anything | 81 | * readable by anyone but the user him/herself, but does not contain anything |
82 | * particularly secret. If the user\'s home directory resides on an NFS | 82 | * particularly secret. If the user's home directory resides on an NFS |
83 | * volume where root is mapped to nobody, this may need to be world-readable. | 83 | * volume where root is mapped to nobody, this may need to be world-readable. |
84 | */ | 84 | */ |
85 | #define _PATH_SSH_USER_CONFFILE ".ssh/config" | 85 | #define _PATH_SSH_USER_CONFFILE ".ssh/config" |
@@ -87,7 +87,7 @@ | |||
87 | /* | 87 | /* |
88 | * File containing a list of those rsa keys that permit logging in as this | 88 | * File containing a list of those rsa keys that permit logging in as this |
89 | * user. This file need not be readable by anyone but the user him/herself, | 89 | * user. This file need not be readable by anyone but the user him/herself, |
90 | * but does not contain anything particularly secret. If the user\'s home | 90 | * but does not contain anything particularly secret. If the user's home |
91 | * directory resides on an NFS volume where root is mapped to nobody, this | 91 | * directory resides on an NFS volume where root is mapped to nobody, this |
92 | * may need to be world-readable. (This file is read by the daemon which is | 92 | * may need to be world-readable. (This file is read by the daemon which is |
93 | * running as root.) | 93 | * running as root.) |