summaryrefslogtreecommitdiff
path: root/pathnames.h
diff options
context:
space:
mode:
Diffstat (limited to 'pathnames.h')
-rw-r--r--pathnames.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/pathnames.h b/pathnames.h
index c3d9abff5..5027fbaed 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>
@@ -65,18 +65,18 @@
65 * readable by anyone except the user him/herself, though this does not 65 * readable by anyone except the user him/herself, though this does not
66 * contain anything particularly secret. 66 * contain anything particularly secret.
67 */ 67 */
68#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" 68#define _PATH_SSH_USER_HOSTFILE "~/" _PATH_SSH_USER_DIR "/known_hosts"
69/* backward compat for protocol 2 */ 69/* backward compat for protocol 2 */
70#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" 70#define _PATH_SSH_USER_HOSTFILE2 "~/" _PATH_SSH_USER_DIR "/known_hosts2"
71 71
72/* 72/*
73 * Name of the default file containing client-side authentication key. This 73 * Name of the default file containing client-side authentication key. This
74 * file should only be readable by the user him/herself. 74 * file should only be readable by the user him/herself.
75 */ 75 */
76#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" 76#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity"
77#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" 77#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa"
78#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" 78#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa"
79#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" 79#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa"
80 80
81/* 81/*
82 * Configuration file in user's home directory. This file need not be 82 * Configuration file in user's home directory. This file need not be
@@ -84,7 +84,7 @@
84 * particularly secret. If the user's home directory resides on an NFS 84 * particularly secret. If the user's home directory resides on an NFS
85 * volume where root is mapped to nobody, this may need to be world-readable. 85 * volume where root is mapped to nobody, this may need to be world-readable.
86 */ 86 */
87#define _PATH_SSH_USER_CONFFILE ".ssh/config" 87#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config"
88 88
89/* 89/*
90 * File containing a list of those rsa keys that permit logging in as this 90 * File containing a list of those rsa keys that permit logging in as this
@@ -94,10 +94,10 @@
94 * may need to be world-readable. (This file is read by the daemon which is 94 * may need to be world-readable. (This file is read by the daemon which is
95 * running as root.) 95 * running as root.)
96 */ 96 */
97#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" 97#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys"
98 98
99/* backward compat for protocol v2 */ 99/* backward compat for protocol v2 */
100#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" 100#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2"
101 101
102/* 102/*
103 * Per-user and system-wide ssh "rc" files. These files are executed with 103 * Per-user and system-wide ssh "rc" files. These files are executed with
@@ -105,7 +105,7 @@
105 * passed "proto cookie" as arguments if X11 forwarding with spoofing is in 105 * passed "proto cookie" as arguments if X11 forwarding with spoofing is in
106 * use. xauth will be run if neither of these exists. 106 * use. xauth will be run if neither of these exists.
107 */ 107 */
108#define _PATH_SSH_USER_RC ".ssh/rc" 108#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc"
109#define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" 109#define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc"
110 110
111/* 111/*