tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 17:25:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2006/02/12 06:45:34

Browse Source 
[ssh.c ssh_config.5]
     add a %l expansion code to the ControlPath, which is filled in with the
     local hostname at runtime. Requested by henning@ to avoid some problems
     with /home on NFS; ok dtucker@
This commit is contained in:
Damien Miller 2006-03-15 11:30:13 +11:00
parent 3fd019ecca
commit 3ec54c7e58
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -69,6 +69,11 @@
- otto@cvs.openbsd.org 2006/02/11 19:31:18 - otto@cvs.openbsd.org 2006/02/11 19:31:18
[atomicio.c] [atomicio.c]
type correctness; from Ray Lai in PR 5011; ok millert@ type correctness; from Ray Lai in PR 5011; ok millert@
- djm@cvs.openbsd.org 2006/02/12 06:45:34
[ssh.c ssh_config.5]
add a %l expansion code to the ControlPath, which is filled in with the
local hostname at runtime. Requested by henning@ to avoid some problems
with /home on NFS; ok dtucker@
20060313 20060313
- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@ -3970,4 +3975,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4159 2006/03/15 00:29:51 djm Exp $ $Id: ChangeLog,v 1.4160 2006/03/15 00:30:13 djm Exp $

8
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.260 2006/02/10 00:27:13 stevesk Exp $"); RCSID("$OpenBSD: ssh.c,v 1.261 2006/02/12 06:45:34 djm Exp $");
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -638,11 +638,15 @@ again:
options.control_path = NULL; options.control_path = NULL;
if (options.control_path != NULL) { if (options.control_path != NULL) {
char me[NI_MAXHOST];
if (gethostname(me, sizeof(me)) == -1)
fatal("gethostname: %s", strerror(errno));
snprintf(buf, sizeof(buf), "%d", options.port); snprintf(buf, sizeof(buf), "%d", options.port);
cp = tilde_expand_filename(options.control_path, cp = tilde_expand_filename(options.control_path,
original_real_uid); original_real_uid);
options.control_path = percent_expand(cp, "p", buf, "h", host, options.control_path = percent_expand(cp, "p", buf, "h", host,
"r", options.user, (char *)NULL); "r", options.user, "l", me, (char *)NULL);
xfree(cp); xfree(cp);
} }
if (mux_command != 0 && options.control_path == NULL) if (mux_command != 0 && options.control_path == NULL)

6
ssh_config.5
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.76 2006/01/20 11:21:45 jmc Exp $ .\" $OpenBSD: ssh_config.5,v 1.77 2006/02/12 06:45:34 djm Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -306,6 +306,8 @@ section above or the string
.Dq none .Dq none
to disable connection sharing. to disable connection sharing.
In the path, In the path,
.Ql %l
will be substituted by the local host name,
.Ql %h .Ql %h
will be substituted by the target host name, will be substituted by the target host name,
.Ql %p .Ql %p
@ -315,7 +317,7 @@ by the remote login username.
It is recommended that any It is recommended that any
.Cm ControlPath .Cm ControlPath
used for opportunistic connection sharing include used for opportunistic connection sharing include
all three of these escape sequences. at least the last three of these escape sequences (%h, %p and %r).
This ensures that shared connections are uniquely identified. This ensures that shared connections are uniquely identified.
.It Cm DynamicForward .It Cm DynamicForward
Specifies that a TCP port on the local machine be forwarded Specifies that a TCP port on the local machine be forwarded