Attachment 1322 Details for Bug 1330 – patch against 4.6p1 with some fixes

[patch] patch against 4.6p1 with some fixes

openssh-4.6p1-controlpersist.patch.txt (text/plain), 2.43 KB, created by Wout Mertens on 2007-07-10 22:02:33 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Wout Mertens

Created: 2007-07-10 22:02:33 AEST

Size: 2.43 KB

patch

obsolete

>diff -ru openssh-4.6p1-orig/clientloop.c openssh-4.6p1/clientloop.c
>--- openssh-4.6p1-orig/clientloop.c	2007-07-10 12:48:22.000000000 +0200
>+++ openssh-4.6p1/clientloop.c	2007-07-10 13:23:45.000000000 +0200
>@@ -1343,8 +1343,12 @@
> client_channel_closed(int id, void *arg)
> {
> 	channel_cancel_cleanup(id);
>-	session_closed = 1;
> 	leave_raw_mode();
>+	if (options.control_persist && options.control_path != NULL && control_fd != -1) {
>+		daemon(0,0);
>+		return;
>+	}
>+	session_closed = 1;
> }
> 
> /*
>diff -ru openssh-4.6p1-orig/readconf.c openssh-4.6p1/readconf.c
>--- openssh-4.6p1-orig/readconf.c	2007-07-10 12:48:22.000000000 +0200
>+++ openssh-4.6p1/readconf.c	2007-07-10 13:22:59.000000000 +0200
>@@ -128,7 +128,7 @@
> 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
> 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
> 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
>-	oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
>+	oSendEnv, oControlPath, oControlMaster, oControlPersist, oHashKnownHosts,
> 	oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
> 	oDeprecated, oUnsupported
> } OpCodes;
>@@ -221,6 +221,7 @@
> 	{ "sendenv", oSendEnv },
> 	{ "controlpath", oControlPath },
> 	{ "controlmaster", oControlMaster },
>+	{ "controlpersist", oControlPersist },
> 	{ "hashknownhosts", oHashKnownHosts },
> 	{ "tunnel", oTunnel },
> 	{ "tunneldevice", oTunnelDevice },
>@@ -868,6 +869,10 @@
> 			*intptr = value;
> 		break;
> 
>+	case oControlPersist:
>+		intptr = &options->control_persist;
>+		goto parse_flag;
>+
> 	case oHashKnownHosts:
> 		intptr = &options->hash_known_hosts;
> 		goto parse_flag;
>@@ -1059,6 +1064,7 @@
> 	options->num_send_env = 0;
> 	options->control_path = NULL;
> 	options->control_master = -1;
>+	options->control_persist = -1;
> 	options->hash_known_hosts = -1;
> 	options->tun_open = -1;
> 	options->tun_local = -1;
>@@ -1189,6 +1195,8 @@
> 		options->server_alive_count_max = 3;
> 	if (options->control_master == -1)
> 		options->control_master = 0;
>+	if (options->control_persist == -1)
>+		options->control_persist = 0;
> 	if (options->hash_known_hosts == -1)
> 		options->hash_known_hosts = 0;
> 	if (options->tun_open == -1)
>diff -ru openssh-4.6p1-orig/readconf.h openssh-4.6p1/readconf.h
>--- openssh-4.6p1-orig/readconf.h	2007-07-10 12:48:22.000000000 +0200
>+++ openssh-4.6p1/readconf.h	2007-07-10 13:21:50.000000000 +0200
>@@ -111,6 +111,7 @@
> 
> 	char	*control_path;
> 	int	control_master;
>+	int	control_persist;
> 
> 	int	hash_known_hosts;
>

Actions: View | Diff

Attachments on bug 1330: 1319 | 1322 | 1331 | 1338 | 1605 | 1858 | 1897