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

Return to auth.c CVS log

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

version 1.129, 2018/06/01 03:33:53

version 1.130, 2018/06/06 18:23:32

Line 871

int do_env = options.permit_user_env && opts->nenv > 0;

int do_permitopen = opts->npermitopen > 0 &&

(options.allow_tcp_forwarding & FORWARD_LOCAL) != 0;

int do_permitlisten = opts->npermitlisten > 0 &&

(options.allow_tcp_forwarding & FORWARD_REMOTE) != 0;

size_t i;

char msg[1024], buf[64];

snprintf(buf, sizeof(buf), "%d", opts->force_tun_device);

/* Try to keep this alphabetically sorted */

snprintf(msg, sizeof(msg), "key options:%s%s%s%s%s%s%s%s%s%s%s%s",

snprintf(msg, sizeof(msg), "key options:%s%s%s%s%s%s%s%s%s%s%s%s%s",

opts->permit_agent_forwarding_flag ? " agent-forwarding" : "",

opts->force_command == NULL ? "" : " command",

do_env ? " environment" : "",

opts->valid_before == 0 ? "" : "expires",

do_permitopen ? " permitopen" : "",

do_permitlisten ? " permitlisten" : "",

opts->permit_port_forwarding_flag ? " port-forwarding" : "",

opts->cert_principals == NULL ? "" : " principals",

opts->permit_pty_flag ? " pty" : "",

Line 915

Line 918

}

if (opts->force_command != NULL)

debug("%s: forced command: \"%s\"", loc, opts->force_command);

if ((options.allow_tcp_forwarding & FORWARD_LOCAL) != 0) {

if (do_permitopen) {

for (i = 0; i < opts->npermitopen; i++) {

debug("%s: permitted open: %s",

loc, opts->permitopen[i]);

}

if (do_permitlisten) {

for (i = 0; i < opts->npermitlisten; i++) {

debug("%s: permitted listen: %s",

loc, opts->permitlisten[i]);

}