Attachment #1322 for bug #1330




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;
}

/*

Lines 128-134 Link Here

(-)openssh-4.6p1-orig/readconf.c (-1 / +9 lines)
128	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,	128	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
129	oAddressFamily, oGssAuthentication, oGssDelegateCreds,	129	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
130	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,	130	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
131	oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,	131	oSendEnv, oControlPath, oControlMaster, oControlPersist, oHashKnownHosts,
132	oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,	132	oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
133	oDeprecated, oUnsupported	133	oDeprecated, oUnsupported
134	} OpCodes;	134	} OpCodes;
Lines 221-226 Link Here
221	{ "sendenv", oSendEnv },	221	{ "sendenv", oSendEnv },
222	{ "controlpath", oControlPath },	222	{ "controlpath", oControlPath },
223	{ "controlmaster", oControlMaster },	223	{ "controlmaster", oControlMaster },
		224	{ "controlpersist", oControlPersist },
224	{ "hashknownhosts", oHashKnownHosts },	225	{ "hashknownhosts", oHashKnownHosts },
225	{ "tunnel", oTunnel },	226	{ "tunnel", oTunnel },
226	{ "tunneldevice", oTunnelDevice },	227	{ "tunneldevice", oTunnelDevice },
Lines 868-873 Link Here
868	*intptr = value;	869	*intptr = value;
869	break;	870	break;
870		871
		872	case oControlPersist:
		873	intptr = &options->control_persist;
		874	goto parse_flag;
		875
871	case oHashKnownHosts:	876	case oHashKnownHosts:
872	intptr = &options->hash_known_hosts;	877	intptr = &options->hash_known_hosts;
873	goto parse_flag;	878	goto parse_flag;
Lines 1059-1064 Link Here
1059	options->num_send_env = 0;	1064	options->num_send_env = 0;
1060	options->control_path = NULL;	1065	options->control_path = NULL;
1061	options->control_master = -1;	1066	options->control_master = -1;
		1067	options->control_persist = -1;
1062	options->hash_known_hosts = -1;	1068	options->hash_known_hosts = -1;
1063	options->tun_open = -1;	1069	options->tun_open = -1;
1064	options->tun_local = -1;	1070	options->tun_local = -1;
Lines 1189-1194 Link Here
1189	options->server_alive_count_max = 3;	1195	options->server_alive_count_max = 3;
1190	if (options->control_master == -1)	1196	if (options->control_master == -1)
1191	options->control_master = 0;	1197	options->control_master = 0;
		1198	if (options->control_persist == -1)
		1199	options->control_persist = 0;
1192	if (options->hash_known_hosts == -1)	1200	if (options->hash_known_hosts == -1)
1193	options->hash_known_hosts = 0;	1201	options->hash_known_hosts = 0;
1194	if (options->tun_open == -1)	1202	if (options->tun_open == -1)

Lines 111-116 Link Here

(-)openssh-4.6p1-orig/readconf.h (+1 lines)
111		111
112	char *control_path;	112	char *control_path;
113	int control_master;	113	int control_master;
		114	int control_persist;
114		115
115	int hash_known_hosts;	116	int hash_known_hosts;
116		117

Return to bug 1330

Lines 1343-1350 Link Here

(-)openssh-4.6p1-orig/clientloop.c (-1 / +5 lines)
1343	client_channel_closed(int id, void *arg)	1343	client_channel_closed(int id, void *arg)
1344	{	1344	{
1345	channel_cancel_cleanup(id);	1345	channel_cancel_cleanup(id);
1346	session_closed = 1;
1347	leave_raw_mode();	1346	leave_raw_mode();
		1347	if (options.control_persist && options.control_path != NULL && control_fd != -1) {
		1348	daemon(0,0);
		1349	return;
		1350	}
		1351	session_closed = 1;
1348	}	1352	}
1349		1353
1350	/*	1354	/*