Attachment 2541 Details for Bug 2346 – proposed patch

proposed patch

file_2346.txt (text/plain), 2.01 KB, created by Jakub Jelen on 2015-01-30 23:52:11 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jelen

Created: 2015-01-30 23:52:11 AEDT

Size: 2.01 KB

patch

obsolete

>diff --git a/servconf.c b/servconf.c
>index b7f3294..4ef512f 100644
>--- a/servconf.c
>+++ b/servconf.c
>@@ -1974,6 +1974,8 @@ dump_cfg_strarray_oneline(ServerOpCodes code, u_int count, char **vals)
> {
> 	u_int i;
> 
>+	if (count <= 0)
>+		return;
> 	printf("%s", lookup_opcode_name(code));
> 	for (i = 0; i < count; i++)
> 		printf(" %s",  vals[i]);
>@@ -2011,7 +2011,7 @@ dump_config(ServerOptions *o)
> 
> 	/* integer arguments */
> #ifdef USE_PAM
>-	dump_cfg_int(sUsePAM, o->use_pam);
>+	dump_cfg_fmtint(sUsePAM, o->use_pam);
> #endif
> 	dump_cfg_int(sServerKeyBits, o->server_key_bits);
> 	dump_cfg_int(sLoginGraceTime, o->login_grace_time);
>@@ -2021,6 +2021,7 @@ dump_config(ServerOptions *o)
> 	dump_cfg_int(sMaxSessions, o->max_sessions);
> 	dump_cfg_int(sClientAliveInterval, o->client_alive_interval);
> 	dump_cfg_int(sClientAliveCountMax, o->client_alive_count_max);
>+	dump_cfg_int(sStreamLocalBindMask, o->fwd_opts.streamlocal_bind_mask);
> 
> 	/* formatted integer arguments */
> 	dump_cfg_fmtint(sPermitRootLogin, o->permit_root_login);
>@@ -2064,6 +2065,7 @@ dump_config(ServerOptions *o)
> 	dump_cfg_fmtint(sGatewayPorts, o->fwd_opts.gateway_ports);
> 	dump_cfg_fmtint(sUseDNS, o->use_dns);
> 	dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding);
>+	dump_cfg_fmtint(sAllowAgentForwarding, o->allow_agent_forwarding);
> 	dump_cfg_fmtint(sAllowStreamLocalForwarding, o->allow_streamlocal_forwarding);
> 	dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep);
> 
>@@ -2080,7 +2082,8 @@ dump_config(ServerOptions *o)
> 	dump_cfg_string(sRevokedKeys, o->revoked_keys_file);
> 	dump_cfg_string(sAuthorizedPrincipalsFile,
> 	    o->authorized_principals_file);
>-	dump_cfg_string(sVersionAddendum, o->version_addendum);
>+	dump_cfg_string(sVersionAddendum, *o->version_addendum == '\0'
>+	    ? "none" : o->version_addendum);
> 	dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);
> 	dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);
> 	dump_cfg_string(sHostKeyAgent, o->host_key_agent);

Actions: View

Attachments on bug 2346: 2541 | 2542