View | Details | Raw Unified | Return to bug 2208
Collapse All | Expand All

(-)servconf.c.old (-5 / +10 lines)
Lines 1951-1957 Link Here
1951
	u_int i;
1951
	u_int i;
1952
	int ret;
1952
	int ret;
1953
	struct addrinfo *ai;
1953
	struct addrinfo *ai;
1954
	char addr[NI_MAXHOST], port[NI_MAXSERV], *s = NULL;
1954
	char addr[NI_MAXHOST], port[NI_MAXSERV], *s = NULL, *cp;
1955
1955
1956
	/* these are usually at the top of the config */
1956
	/* these are usually at the top of the config */
1957
	for (i = 0; i < o->num_ports; i++)
1957
	for (i = 0; i < o->num_ports; i++)
Lines 2038-2046 Link Here
2038
	/* string arguments */
2038
	/* string arguments */
2039
	dump_cfg_string(sPidFile, o->pid_file);
2039
	dump_cfg_string(sPidFile, o->pid_file);
2040
	dump_cfg_string(sXAuthLocation, o->xauth_location);
2040
	dump_cfg_string(sXAuthLocation, o->xauth_location);
2041
	dump_cfg_string(sCiphers, o->ciphers ? o->ciphers :
2041
	cp = cipher_alg_list('n', 0);
2042
	    cipher_alg_list(',', 0));
2042
	dump_cfg_string(sCiphers, o->ciphers ? o->ciphers : cp);
2043
	dump_cfg_string(sMacs, o->macs ? o->macs : mac_alg_list(','));
2043
	free(cp);
2044
	cp = mac_alg_list(',');
2045
	dump_cfg_string(sMacs, o->macs ? o->macs : cp);
2046
	free(cp);
2044
	dump_cfg_string(sBanner, o->banner);
2047
	dump_cfg_string(sBanner, o->banner);
2045
	dump_cfg_string(sForceCommand, o->adm_forced_command);
2048
	dump_cfg_string(sForceCommand, o->adm_forced_command);
2046
	dump_cfg_string(sChrootDirectory, o->chroot_directory);
2049
	dump_cfg_string(sChrootDirectory, o->chroot_directory);
Lines 2052-2059 Link Here
2052
	dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);
2055
	dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);
2053
	dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);
2056
	dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);
2054
	dump_cfg_string(sHostKeyAgent, o->host_key_agent);
2057
	dump_cfg_string(sHostKeyAgent, o->host_key_agent);
2058
	cp = kex_alg_list(',');
2055
	dump_cfg_string(sKexAlgorithms, o->kex_algorithms ? o->kex_algorithms :
2059
	dump_cfg_string(sKexAlgorithms, o->kex_algorithms ? o->kex_algorithms :
2056
	    kex_alg_list(','));
2060
	    cp);
2061
	free(cp);
2057
2062
2058
	/* string arguments requiring a lookup */
2063
	/* string arguments requiring a lookup */
2059
	dump_cfg_string(sLogLevel, log_level_name(o->log_level));
2064
	dump_cfg_string(sLogLevel, log_level_name(o->log_level));

Return to bug 2208