diff options
Diffstat (limited to 'pathnames.h')
-rw-r--r-- | pathnames.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pathnames.h b/pathnames.h index 0cdfcef7f..47f7867d5 100644 --- a/pathnames.h +++ b/pathnames.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pathnames.h,v 1.22 2011/05/23 03:30:07 djm Exp $ */ | 1 | /* $OpenBSD: pathnames.h,v 1.23 2013/04/05 00:31:49 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -72,18 +72,18 @@ | |||
72 | * readable by anyone except the user him/herself, though this does not | 72 | * readable by anyone except the user him/herself, though this does not |
73 | * contain anything particularly secret. | 73 | * contain anything particularly secret. |
74 | */ | 74 | */ |
75 | #define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" | 75 | #define _PATH_SSH_USER_HOSTFILE "~/" _PATH_SSH_USER_DIR "/known_hosts" |
76 | /* backward compat for protocol 2 */ | 76 | /* backward compat for protocol 2 */ |
77 | #define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" | 77 | #define _PATH_SSH_USER_HOSTFILE2 "~/" _PATH_SSH_USER_DIR "/known_hosts2" |
78 | 78 | ||
79 | /* | 79 | /* |
80 | * Name of the default file containing client-side authentication key. This | 80 | * Name of the default file containing client-side authentication key. This |
81 | * file should only be readable by the user him/herself. | 81 | * file should only be readable by the user him/herself. |
82 | */ | 82 | */ |
83 | #define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" | 83 | #define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" |
84 | #define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" | 84 | #define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" |
85 | #define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" | 85 | #define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa" |
86 | #define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" | 86 | #define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" |
87 | 87 | ||
88 | /* | 88 | /* |
89 | * Configuration file in user's home directory. This file need not be | 89 | * Configuration file in user's home directory. This file need not be |
@@ -91,7 +91,7 @@ | |||
91 | * particularly secret. If the user's home directory resides on an NFS | 91 | * particularly secret. If the user's home directory resides on an NFS |
92 | * volume where root is mapped to nobody, this may need to be world-readable. | 92 | * volume where root is mapped to nobody, this may need to be world-readable. |
93 | */ | 93 | */ |
94 | #define _PATH_SSH_USER_CONFFILE ".ssh/config" | 94 | #define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" |
95 | 95 | ||
96 | /* | 96 | /* |
97 | * File containing a list of those rsa keys that permit logging in as this | 97 | * File containing a list of those rsa keys that permit logging in as this |
@@ -101,10 +101,10 @@ | |||
101 | * may need to be world-readable. (This file is read by the daemon which is | 101 | * may need to be world-readable. (This file is read by the daemon which is |
102 | * running as root.) | 102 | * running as root.) |
103 | */ | 103 | */ |
104 | #define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" | 104 | #define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" |
105 | 105 | ||
106 | /* backward compat for protocol v2 */ | 106 | /* backward compat for protocol v2 */ |
107 | #define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" | 107 | #define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" |
108 | 108 | ||
109 | /* | 109 | /* |
110 | * Per-user and system-wide ssh "rc" files. These files are executed with | 110 | * Per-user and system-wide ssh "rc" files. These files are executed with |
@@ -112,7 +112,7 @@ | |||
112 | * passed "proto cookie" as arguments if X11 forwarding with spoofing is in | 112 | * passed "proto cookie" as arguments if X11 forwarding with spoofing is in |
113 | * use. xauth will be run if neither of these exists. | 113 | * use. xauth will be run if neither of these exists. |
114 | */ | 114 | */ |
115 | #define _PATH_SSH_USER_RC ".ssh/rc" | 115 | #define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" |
116 | #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" | 116 | #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" |
117 | 117 | ||
118 | /* | 118 | /* |