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.231 and 1.232

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

version 1.232, 2012/11/04 11:09:15

Line 46

#include "groupaccess.h"

#include "canohost.h"

#include "packet.h"

#include "hostfile.h"

#include "auth.h"

static void add_listen_addr(ServerOptions *, char *, int);

static void add_one_listen_addr(ServerOptions *, char *, int);

Line 305

Line 307

sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile,

sKexAlgorithms, sIPQoS, sVersionAddendum,

sAuthorizedKeysCommand, sAuthorizedKeysCommandUser,

sAuthenticationMethods,

sDeprecated, sUnsupported

} ServerOpCodes;

Line 420

Line 423

{ "authorizedkeyscommand", sAuthorizedKeysCommand, SSHCFG_ALL },

{ "authorizedkeyscommanduser", sAuthorizedKeysCommandUser, SSHCFG_ALL },

{ "versionaddendum", sVersionAddendum, SSHCFG_GLOBAL },

{ "authenticationmethods", sAuthenticationMethods, SSHCFG_ALL },

{ NULL, sBadOption, 0 }

};

Line 1477

Line 1481

*charptr = xstrdup(arg);

break;

case sAuthenticationMethods:

if (*activep && options->num_auth_methods == 0) {

while ((arg = strdelim(&cp)) && *arg != '\0') {

if (options->num_auth_methods >=

MAX_AUTH_METHODS)

fatal("%s line %d: "

"too many authentication methods.",

filename, linenum);

if (auth2_methods_valid(arg, 0) != 0)

fatal("%s line %d: invalid "

"authentication method list.",

filename, linenum);

options->auth_methods[

options->num_auth_methods++] = xstrdup(arg);

}

return 0;

case sDeprecated:

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

filename, linenum, arg);

Line 1903

Line 1925

dump_cfg_strarray(sAllowGroups, o->num_allow_groups, o->allow_groups);

dump_cfg_strarray(sDenyGroups, o->num_deny_groups, o->deny_groups);

dump_cfg_strarray(sAcceptEnv, o->num_accept_env, o->accept_env);

dump_cfg_strarray_oneline(sAuthenticationMethods,

o->num_auth_methods, o->auth_methods);

/* other arguments */

for (i = 0; i < o->num_subsystems; i++)