src/usr.bin/ssh/ssh-keygen.c - diff - 1.196

Return to ssh-keygen.c CVS log

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

Diff for /src/usr.bin/ssh/ssh-keygen.c between version 1.195 and 1.196

version 1.195, 2010/07/16 04:45:30

version 1.196, 2010/08/04 05:40:39

Line 1287

Line 1287

prepare_options_buf(Buffer *c, int which)

prepare_options_buf(Buffer *c, int which)

{

{

buffer_clear(c);

buffer_clear(c);

if ((which & OPTIONS_CRITICAL) != 0 &&

certflags_command != NULL)

add_string_option(c, "force-command", certflags_command);

if ((which & OPTIONS_EXTENSIONS) != 0 &&

if ((which & OPTIONS_EXTENSIONS) != 0 &&

(certflags_flags & CERTOPT_X_FWD) != 0)

add_flag_option(c, "permit-X11-forwarding");

if ((which & OPTIONS_EXTENSIONS) != 0 &&

(certflags_flags & CERTOPT_AGENT_FWD) != 0)

(certflags_flags & CERTOPT_AGENT_FWD) != 0)

add_flag_option(c, "permit-agent-forwarding");

add_flag_option(c, "permit-agent-forwarding");

if ((which & OPTIONS_EXTENSIONS) != 0 &&

if ((which & OPTIONS_EXTENSIONS) != 0 &&

Line 1302

Line 1302

if ((which & OPTIONS_EXTENSIONS) != 0 &&

if ((which & OPTIONS_EXTENSIONS) != 0 &&

(certflags_flags & CERTOPT_USER_RC) != 0)

(certflags_flags & CERTOPT_USER_RC) != 0)

add_flag_option(c, "permit-user-rc");

add_flag_option(c, "permit-user-rc");

if ((which & OPTIONS_CRITICAL) != 0 &&

if ((which & OPTIONS_EXTENSIONS) != 0 &&

certflags_command != NULL)

(certflags_flags & CERTOPT_X_FWD) != 0)

add_string_option(c, "force-command", certflags_command);

add_flag_option(c, "permit-X11-forwarding");

if ((which & OPTIONS_CRITICAL) != 0 &&

if ((which & OPTIONS_CRITICAL) != 0 &&

certflags_src_addr != NULL)

certflags_src_addr != NULL)

add_string_option(c, "source-address", certflags_src_addr);

add_string_option(c, "source-address", certflags_src_addr);