RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/04/05 00:31:49 

[pathnames.h]
     use the existing _PATH_SSH_USER_RC define to construct the other
     pathnames; bz#2077, ok dtucker@ (no binary change)
This commit is contained in:
Damien Miller 2013-04-23 15:19:11 +10:00
parent d677ad14ff
commit 9f12b5dcd5
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -28,6 +28,10 @@
- djm@cvs.openbsd.org 2013/04/05 00:14:00 - djm@cvs.openbsd.org 2013/04/05 00:14:00
[auth2-gss.c krl.c sshconnect2.c] [auth2-gss.c krl.c sshconnect2.c]
hush some {unused, printf type} warnings hush some {unused, printf type} warnings
- djm@cvs.openbsd.org 2013/04/05 00:31:49
[pathnames.h]
use the existing _PATH_SSH_USER_RC define to construct the other
pathnames; bz#2077, ok dtucker@ (no binary change)
20130418 20130418
- (djm) [config.guess config.sub] Update to last versions before they switch - (djm) [config.guess config.sub] Update to last versions before they switch

22
pathnames.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: pathnames.h,v 1.22 2011/05/23 03:30:07 djm Exp $ */ /* $OpenBSD: pathnames.h,v 1.23 2013/04/05 00:31:49 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -65,18 +65,18 @@
* readable by anyone except the user him/herself, though this does not * readable by anyone except the user him/herself, though this does not
* contain anything particularly secret. * contain anything particularly secret.
*/ */
#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" #define _PATH_SSH_USER_HOSTFILE "~/" _PATH_SSH_USER_DIR "/known_hosts"
/* backward compat for protocol 2 */ /* backward compat for protocol 2 */
#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" #define _PATH_SSH_USER_HOSTFILE2 "~/" _PATH_SSH_USER_DIR "/known_hosts2"
/* /*
* Name of the default file containing client-side authentication key. This * Name of the default file containing client-side authentication key. This
* file should only be readable by the user him/herself. * file should only be readable by the user him/herself.
*/ */
#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" #define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity"
#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" #define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa"
#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" #define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa"
#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" #define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa"
/* /*
* Configuration file in user's home directory. This file need not be * Configuration file in user's home directory. This file need not be
@ -84,7 +84,7 @@
* particularly secret. If the user's home directory resides on an NFS * particularly secret. If the user's home directory resides on an NFS
* volume where root is mapped to nobody, this may need to be world-readable. * volume where root is mapped to nobody, this may need to be world-readable.
*/ */
#define _PATH_SSH_USER_CONFFILE ".ssh/config" #define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config"
/* /*
* File containing a list of those rsa keys that permit logging in as this * File containing a list of those rsa keys that permit logging in as this
@ -94,10 +94,10 @@
* may need to be world-readable. (This file is read by the daemon which is * may need to be world-readable. (This file is read by the daemon which is
* running as root.) * running as root.)
*/ */
#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" #define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys"
/* backward compat for protocol v2 */ /* backward compat for protocol v2 */
#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" #define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2"
/* /*
* Per-user and system-wide ssh "rc" files. These files are executed with * Per-user and system-wide ssh "rc" files. These files are executed with
@ -105,7 +105,7 @@
* passed "proto cookie" as arguments if X11 forwarding with spoofing is in * passed "proto cookie" as arguments if X11 forwarding with spoofing is in
* use. xauth will be run if neither of these exists. * use. xauth will be run if neither of these exists.
*/ */
#define _PATH_SSH_USER_RC ".ssh/rc" #define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc"
#define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc"
/* /*