src/usr.bin/ssh/servconf.c - diff

Return to servconf.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/servconf.c between version 1.214 and 1.215

version 1.214, 2011/03/29 18:54:17

version 1.215, 2011/05/11 04:47:06

Line 120

options->client_alive_interval = -1;

options->client_alive_count_max = -1;

options->authorized_keys_file = NULL;

options->authorized_keys_file2 = NULL;

options->num_accept_env = 0;

options->permit_tun = -1;

options->num_permitted_opens = -1;

Line 250

Line 249

options->client_alive_interval = 0;

if (options->client_alive_count_max == -1)

options->client_alive_count_max = 3;

if (options->authorized_keys_file2 == NULL) {

/* authorized_keys_file2 falls back to authorized_keys_file */

if (options->authorized_keys_file != NULL)

options->authorized_keys_file2 = xstrdup(options->authorized_keys_file);

else

options->authorized_keys_file2 = xstrdup(_PATH_SSH_USER_PERMITTED_KEYS2);

}

if (options->authorized_keys_file == NULL)

options->authorized_keys_file = xstrdup(_PATH_SSH_USER_PERMITTED_KEYS);

if (options->permit_tun == -1)

Line 1207

Line 1199

case sAuthorizedKeysFile:

charptr = &options->authorized_keys_file;

goto parse_tilde_filename;

case sAuthorizedKeysFile2:

charptr = &options->authorized_keys_file2;

goto parse_tilde_filename;

case sAuthorizedPrincipalsFile:

charptr = &options->authorized_principals_file;

parse_tilde_filename:

Line 1474

Line 1463

M_CP_STROPT(trusted_user_ca_keys);

M_CP_STROPT(revoked_keys_file);

M_CP_STROPT(authorized_keys_file);

M_CP_STROPT(authorized_keys_file2);

M_CP_STROPT(authorized_principals_file);

}

Line 1687

Line 1675

dump_cfg_string(sMacs, o->macs);

dump_cfg_string(sBanner, o->banner);

dump_cfg_string(sAuthorizedKeysFile, o->authorized_keys_file);

dump_cfg_string(sAuthorizedKeysFile2, o->authorized_keys_file2);

dump_cfg_string(sForceCommand, o->adm_forced_command);

dump_cfg_string(sChrootDirectory, o->chroot_directory);

dump_cfg_string(sTrustedUserCAKeys, o->trusted_user_ca_keys);