diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-22 05:34:40 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-22 05:34:40 +0000 |
commit | 226cfa03781466907dd252916aeade6879e376b8 (patch) | |
tree | 3251d15053db065d74994b95e17fd65874fcaa9b /pathnames.h | |
parent | 401d58f3612fa030f309d01df9815a2fc1d3c6de (diff) |
Hopefully things did not get mixed around too much. It compiles under
Linux and works. So that is at least a good sign. =)
20010122
- (bal) OpenBSD Resync
- markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus
[servconf.c ssh.h sshd.c]
only auth-chall.c needs #ifdef SKEY
- markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus
[auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c
packet.c pathname.h readconf.c scp.c servconf.c serverloop.c
session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h
ssh1.h sshconnect1.c sshd.c ttymodes.c]
move ssh1 definitions to ssh1.h, pathnames to pathnames.h
- markus@cvs.openbsd.org 2001/01/19 16:48:14
[sshd.8]
fix typo; from stevesk@
- markus@cvs.openbsd.org 2001/01/19 16:50:58
[ssh-dss.c]
clear and free digest, make consistent with other code (use dlen); from
stevesk@
- markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus
[auth-options.c auth-options.h auth-rsa.c auth2.c]
pass the filename to auth_parse_options()
- markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001
[readconf.c]
fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com
- stevesk@cvs.openbsd.org 2001/01/20 18:20:29
[sshconnect2.c]
dh_new_group() does not return NULL. ok markus@
- markus@cvs.openbsd.org 2001/01/20 21:33:42
[ssh-add.c]
do not loop forever if askpass does not exist; from
andrew@pimlott.ne.mediaone.net
- djm@cvs.openbsd.org 2001/01/20 23:00:56
[servconf.c]
Check for NULL return from strdelim; ok markus
- djm@cvs.openbsd.org 2001/01/20 23:02:07
[readconf.c]
KNF; ok markus
- jakob@cvs.openbsd.org 2001/01/21 9:00:33
[ssh-keygen.1]
remove -R flag; ok markus@
- markus@cvs.openbsd.org 2001/01/21 19:05:40
[atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c
auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c
bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c
cipher.c cli.c clientloop.c clientloop.h compat.c compress.c
deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c
key.c key.h log-client.c log-server.c log.c log.h login.c login.h
match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c
readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h
session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c
ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h
sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h
ttysmodes.c uidswap.c xmalloc.c]
split ssh.h and try to cleanup the #include mess. remove unnecessary
#includes. rename util.[ch] -> misc.[ch]
- (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree
- (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve
conflict when compiling for non-kerb install
- (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes
on 1/19.
Diffstat (limited to 'pathnames.h')
-rw-r--r-- | pathnames.h | 136 |
1 files changed, 136 insertions, 0 deletions
diff --git a/pathnames.h b/pathnames.h new file mode 100644 index 000000000..702251c08 --- /dev/null +++ b/pathnames.h | |||
@@ -0,0 +1,136 @@ | |||
1 | /* | ||
2 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | ||
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | ||
4 | * All rights reserved | ||
5 | * | ||
6 | * As far as I am concerned, the code I have written for this software | ||
7 | * can be used freely for any purpose. Any derived versions of this | ||
8 | * software must be clearly marked as such, and if the derived work is | ||
9 | * incompatible with the protocol description in the RFC file, it must be | ||
10 | * called by a name other than "ssh" or "Secure Shell". | ||
11 | */ | ||
12 | |||
13 | #ifndef ETCDIR | ||
14 | #define ETCDIR "/etc" | ||
15 | #endif | ||
16 | |||
17 | #ifndef _PATH_SSH_PIDDIR | ||
18 | #define _PATH_SSH_PIDDIR "/var/run" | ||
19 | #endif | ||
20 | |||
21 | /* | ||
22 | * System-wide file containing host keys of known hosts. This file should be | ||
23 | * world-readable. | ||
24 | */ | ||
25 | #define _PATH_SSH_SYSTEM_HOSTFILE ETCDIR "/ssh_known_hosts" | ||
26 | #define _PATH_SSH_SYSTEM_HOSTFILE2 ETCDIR "/ssh_known_hosts2" | ||
27 | |||
28 | /* | ||
29 | * Of these, ssh_host_key must be readable only by root, whereas ssh_config | ||
30 | * should be world-readable. | ||
31 | */ | ||
32 | #define _PATH_HOST_KEY_FILE ETCDIR "/ssh_host_key" | ||
33 | #define _PATH_SERVER_CONFIG_FILE ETCDIR "/sshd_config" | ||
34 | #define _PATH_HOST_CONFIG_FILE ETCDIR "/ssh_config" | ||
35 | #define _PATH_HOST_DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key" | ||
36 | #define _PATH_DH_PRIMES ETCDIR "/primes" | ||
37 | |||
38 | #define _PATH_SSH_PROGRAM "/usr/bin/ssh" | ||
39 | |||
40 | /* | ||
41 | * The process id of the daemon listening for connections is saved here to | ||
42 | * make it easier to kill the correct daemon when necessary. | ||
43 | */ | ||
44 | #define _PATH_SSH_DAEMON_PID_FILE _PATH_SSH_PIDDIR "/sshd.pid" | ||
45 | |||
46 | /* | ||
47 | * The directory in user\'s home directory in which the files reside. The | ||
48 | * directory should be world-readable (though not all files are). | ||
49 | */ | ||
50 | #define _PATH_SSH_USER_DIR ".ssh" | ||
51 | |||
52 | /* | ||
53 | * Per-user file containing host keys of known hosts. This file need not be | ||
54 | * readable by anyone except the user him/herself, though this does not | ||
55 | * contain anything particularly secret. | ||
56 | */ | ||
57 | #define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" | ||
58 | #define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" | ||
59 | |||
60 | /* | ||
61 | * Name of the default file containing client-side authentication key. This | ||
62 | * file should only be readable by the user him/herself. | ||
63 | */ | ||
64 | #define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" | ||
65 | #define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" | ||
66 | #define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" | ||
67 | |||
68 | /* | ||
69 | * Configuration file in user\'s home directory. This file need not be | ||
70 | * readable by anyone but the user him/herself, but does not contain anything | ||
71 | * particularly secret. If the user\'s home directory resides on an NFS | ||
72 | * volume where root is mapped to nobody, this may need to be world-readable. | ||
73 | */ | ||
74 | #define _PATH_SSH_USER_CONFFILE ".ssh/config" | ||
75 | |||
76 | /* | ||
77 | * File containing a list of those rsa keys that permit logging in as this | ||
78 | * user. This file need not be readable by anyone but the user him/herself, | ||
79 | * but does not contain anything particularly secret. If the user\'s home | ||
80 | * directory resides on an NFS volume where root is mapped to nobody, this | ||
81 | * may need to be world-readable. (This file is read by the daemon which is | ||
82 | * running as root.) | ||
83 | */ | ||
84 | #define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" | ||
85 | #define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" | ||
86 | |||
87 | /* | ||
88 | * Per-user and system-wide ssh "rc" files. These files are executed with | ||
89 | * /bin/sh before starting the shell or command if they exist. They will be | ||
90 | * passed "proto cookie" as arguments if X11 forwarding with spoofing is in | ||
91 | * use. xauth will be run if neither of these exists. | ||
92 | */ | ||
93 | #define _PATH_SSH_USER_RC ".ssh/rc" | ||
94 | #define _PATH_SSH_SYSTEM_RC ETCDIR "/sshrc" | ||
95 | |||
96 | /* | ||
97 | * Ssh-only version of /etc/hosts.equiv. Additionally, the daemon may use | ||
98 | * ~/.rhosts and /etc/hosts.equiv if rhosts authentication is enabled. | ||
99 | */ | ||
100 | #define _PATH_SSH_HOSTS_EQUIV ETCDIR "/shosts.equiv" | ||
101 | #define _PATH_RHOSTS_EQUIV "/etc/hosts.equiv" | ||
102 | |||
103 | /* | ||
104 | * Default location of askpass | ||
105 | */ | ||
106 | #define _PATH_SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass" | ||
107 | |||
108 | /* for scp */ | ||
109 | #ifndef _PATH_CP | ||
110 | #define _PATH_CP "cp" | ||
111 | #endif | ||
112 | |||
113 | /* path to login program */ | ||
114 | #ifndef LOGIN_PROGRAM | ||
115 | # ifdef LOGIN_PROGRAM_FALLBACK | ||
116 | # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK | ||
117 | # else | ||
118 | # define LOGIN_PROGRAM "/usr/bin/login" | ||
119 | # endif | ||
120 | #endif /* LOGIN_PROGRAM */ | ||
121 | |||
122 | /* Askpass program define */ | ||
123 | #ifndef ASKPASS_PROGRAM | ||
124 | #define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" | ||
125 | #endif /* ASKPASS_PROGRAM */ | ||
126 | |||
127 | /* | ||
128 | * Relevant only when using builtin PRNG. | ||
129 | */ | ||
130 | #ifndef SSH_PRNG_SEED_FILE | ||
131 | # define SSH_PRNG_SEED_FILE SSH_USER_DIR"/prng_seed" | ||
132 | #endif /* SSH_PRNG_SEED_FILE */ | ||
133 | #ifndef SSH_PRNG_COMMAND_FILE | ||
134 | # define SSH_PRNG_COMMAND_FILE ETCDIR "/ssh_prng_cmds" | ||
135 | #endif /* SSH_PRNG_COMMAND_FILE */ | ||
136 | |||