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

Return to readconf.c CVS log

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

Diff for /src/usr.bin/ssh/readconf.c between version 1.184 and 1.185

version 1.184, 2010/05/16 12:55:51

version 1.185, 2010/06/25 07:14:46

Line 248

{

Forward *fwd;

extern uid_t original_real_uid;

if (newfwd->listen_port < IPPORT_RESERVED && original_real_uid != 0)

fatal("Privileged ports can only be forwarded by root.");

if (options->num_local_forwards >= SSH_MAX_FORWARDS_PER_DIRECTION)

options->local_forwards = xrealloc(options->local_forwards,

fatal("Too many local forwards (max %d).", SSH_MAX_FORWARDS_PER_DIRECTION);

options->num_local_forwards + 1,

sizeof(*options->local_forwards));

fwd = &options->local_forwards[options->num_local_forwards++];

fwd->listen_host = newfwd->listen_host;

Line 269

Line 271

add_remote_forward(Options *options, const Forward *newfwd)

{

Forward *fwd;

if (options->num_remote_forwards >= SSH_MAX_FORWARDS_PER_DIRECTION)

fatal("Too many remote forwards (max %d).",

options->remote_forwards = xrealloc(options->remote_forwards,

SSH_MAX_FORWARDS_PER_DIRECTION);

options->num_remote_forwards + 1,

sizeof(*options->remote_forwards));

fwd = &options->remote_forwards[options->num_remote_forwards++];

fwd->listen_host = newfwd->listen_host;

Line 291

Line 294

xfree(options->local_forwards[i].listen_host);

xfree(options->local_forwards[i].connect_host);

}

if (options->num_local_forwards > 0) {

xfree(options->local_forwards);

options->local_forwards = NULL;

}

options->num_local_forwards = 0;

for (i = 0; i < options->num_remote_forwards; i++) {

if (options->remote_forwards[i].listen_host != NULL)

xfree(options->remote_forwards[i].listen_host);

xfree(options->remote_forwards[i].connect_host);

}

if (options->num_remote_forwards > 0) {

xfree(options->remote_forwards);

options->remote_forwards = NULL;

}

options->num_remote_forwards = 0;

options->tun_open = SSH_TUNMODE_NO;

}

Line 1043

Line 1054

options->user_hostfile = NULL;

options->system_hostfile2 = NULL;

options->user_hostfile2 = NULL;

options->local_forwards = NULL;

options->num_local_forwards = 0;

options->remote_forwards = NULL;

options->num_remote_forwards = 0;

options->clear_forwardings = -1;

options->log_level = SYSLOG_LEVEL_NOT_SET;