Attachment 2227 Details for Bug 2077 – user-dir.patch

[patch] user-dir.patch

user-dir.patch (text/plain), 2.56 KB, created by Pierre Ossman on 2013-03-08 19:51:24 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Ossman

Created: 2013-03-08 19:51:24 AEDT

Size: 2.56 KB

patch

obsolete

>? sol-ssh-gss.patch
>? user-dir.patch
>Index: pathnames.h
>===================================================================
>RCS file: /cvs/openssh/pathnames.h,v
>retrieving revision 1.28
>diff -u -r1.28 pathnames.h
>--- pathnames.h	29 May 2011 11:39:38 -0000	1.28
>+++ pathnames.h	8 Mar 2013 08:48:25 -0000
>@@ -65,18 +65,18 @@
>  * readable by anyone except the user him/herself, though this does not
>  * 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 */
>-#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
>  * file should only be readable by the user him/herself.
>  */
>-#define _PATH_SSH_CLIENT_IDENTITY	".ssh/identity"
>-#define _PATH_SSH_CLIENT_ID_DSA		".ssh/id_dsa"
>-#define _PATH_SSH_CLIENT_ID_ECDSA	".ssh/id_ecdsa"
>-#define _PATH_SSH_CLIENT_ID_RSA		".ssh/id_rsa"
>+#define _PATH_SSH_CLIENT_IDENTITY	_PATH_SSH_USER_DIR "/identity"
>+#define _PATH_SSH_CLIENT_ID_DSA		_PATH_SSH_USER_DIR "/id_dsa"
>+#define _PATH_SSH_CLIENT_ID_ECDSA	_PATH_SSH_USER_DIR "/id_ecdsa"
>+#define _PATH_SSH_CLIENT_ID_RSA		_PATH_SSH_USER_DIR "/id_rsa"
> 
> /*
>  * 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
>  * 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
>@@ -94,10 +94,10 @@
>  * may need to be world-readable.  (This file is read by the daemon which is
>  * 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 */
>-#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
>@@ -105,7 +105,7 @@
>  * passed "proto cookie" as arguments if X11 forwarding with spoofing is in
>  * 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"
> 
> /*

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 2077: 2227