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.155 and 1.156

version 1.155, 2006/07/17 01:31:09

version 1.156, 2006/07/17 12:06:00

Line 29

#include "kex.h"

#include "mac.h"

#include "match.h"

#include "channels.h"

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

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

Line 256

Line 257

sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,

sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,

sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,

sMatch,

sMatch, sPermitOpen,

sUsePrivilegeSeparation,

sDeprecated, sUnsupported

} ServerOpCodes;

Line 354

Line 355

{ "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },

{ "permittunnel", sPermitTunnel, SSHCFG_GLOBAL },

{ "match", sMatch, SSHCFG_ALL },

{ "permitopen", sPermitOpen, SSHCFG_ALL },

{ NULL, sBadOption, 0 }

};

Line 1104

Line 1106

fatal("%s line %d: Bad Match condition", filename,

linenum);

*activep = value;

break;

case sPermitOpen:

arg = strdelim(&cp);

if (!arg || *arg == '\0')

fatal("%s line %d: missing PermitOpen specification",

filename, linenum);

if (strcmp(arg, "any") == 0) {

if (*activep)

channel_clear_adm_permitted_opens();

break;

}

p = hpdelim(&arg);

if (p == NULL)

fatal("%s line %d: missing host in PermitOpen",

filename, linenum);

p = cleanhostname(p);

if (arg == NULL || (port = a2port(arg)) == 0)

fatal("%s line %d: bad port number in PermitOpen",

filename, linenum);

if (*activep)

channel_add_adm_permitted_opens(p, port);

break;

case sDeprecated: