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.230 and 1.231

version 1.230, 2012/09/13 23:37:36

version 1.231, 2012/10/30 21:29:54

Line 128

options->num_permitted_opens = -1;

options->adm_forced_command = NULL;

options->chroot_directory = NULL;

options->authorized_keys_command = NULL;

options->authorized_keys_command_user = NULL;

options->zero_knowledge_password_authentication = -1;

options->revoked_keys_file = NULL;

options->trusted_user_ca_keys = NULL;

Line 302

Line 304

sZeroKnowledgePasswordAuthentication, sHostCertificate,

sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,

sKexAlgorithms, sIPQoS, sVersionAddendum,

sAuthorizedKeysCommand, sAuthorizedKeysCommandUser,

sDeprecated, sUnsupported

} ServerOpCodes;

Line 414

Line 417

{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },

{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },

{ "ipqos", sIPQoS, SSHCFG_ALL },

{ "authorizedkeyscommand", sAuthorizedKeysCommand, SSHCFG_ALL },

{ "authorizedkeyscommanduser", sAuthorizedKeysCommandUser, SSHCFG_ALL },

{ "versionaddendum", sVersionAddendum, SSHCFG_GLOBAL },

{ NULL, sBadOption, 0 }

};

Line 1453

Line 1458

}

return 0;

case sAuthorizedKeysCommand:

len = strspn(cp, WHITESPACE);

if (*activep && options->authorized_keys_command == NULL) {

if (cp[len] != '/' && strcasecmp(cp + len, "none") != 0)

fatal("%.200s line %d: AuthorizedKeysCommand "

"must be an absolute path",

filename, linenum);

options->authorized_keys_command = xstrdup(cp + len);

}

return 0;

case sAuthorizedKeysCommandUser:

charptr = &options->authorized_keys_command_user;

arg = strdelim(&cp);

if (*activep && *charptr == NULL)

*charptr = xstrdup(arg);

break;

case sDeprecated:

logit("%s line %d: Deprecated option %s",

filename, linenum, arg);

Line 1603

Line 1627

M_CP_INTOPT(hostbased_uses_name_from_packet_only);

M_CP_INTOPT(kbd_interactive_authentication);

M_CP_INTOPT(zero_knowledge_password_authentication);

M_CP_STROPT(authorized_keys_command);

M_CP_STROPT(authorized_keys_command_user);

M_CP_INTOPT(permit_root_login);

M_CP_INTOPT(permit_empty_passwd);

Line 1858

Line 1884

dump_cfg_string(sAuthorizedPrincipalsFile,

o->authorized_principals_file);

dump_cfg_string(sVersionAddendum, o->version_addendum);

dump_cfg_string(sAuthorizedKeysCommand, o->authorized_keys_command);

dump_cfg_string(sAuthorizedKeysCommandUser, o->authorized_keys_command_user);

/* string arguments requiring a lookup */

dump_cfg_string(sLogLevel, log_level_name(o->log_level));