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

Return to auth-options.c CVS log

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

Diff for /src/usr.bin/ssh/auth-options.c between version 1.49 and 1.50

version 1.49, 2010/03/16 15:46:52

version 1.50, 2010/04/16 01:47:26

Line 25

#include "canohost.h"

#include "buffer.h"

#include "channels.h"

#include "auth-options.h"

#include "servconf.h"

#include "misc.h"

#include "key.h"

#include "auth-options.h"

#include "hostfile.h"

#include "auth.h"

#ifdef GSSAPI

Line 375

}

* Set options from certificate constraints. These supersede user key options

* Set options from critical certificate options. These supersede user key

* so this must be called after auth_parse_options().

* options so this must be called after auth_parse_options().

int

auth_cert_constraints(Buffer *c_orig, struct passwd *pw)

auth_cert_options(Key *k, struct passwd *pw)

{

u_char *name = NULL, *data_blob = NULL;

u_int nlen, dlen, clen;

Line 398

/* Make copy to avoid altering original */

buffer_init(&c);

buffer_append(&c, buffer_ptr(c_orig), buffer_len(c_orig));

buffer_append(&c,

buffer_ptr(&k->cert->critical), buffer_len(&k->cert->critical));

while (buffer_len(&c) > 0) {

if ((name = buffer_get_string_ret(&c, &nlen)) == NULL ||

(data_blob = buffer_get_string_ret(&c, &dlen)) == NULL) {

error("Certificate constraints corrupt");

error("Certificate options corrupt");

goto out;

}

buffer_append(&data, data_blob, dlen);

Line 437

Line 438

}

if (cert_forced_command != NULL) {

error("Certificate has multiple "

"force-command constraints");

"force-command options");

xfree(command);

goto out;

}

Line 457

Line 458

}

if (cert_source_address_done++) {

error("Certificate has multiple "

"source-address constraints");

"source-address options");

xfree(allowed);

goto out;

}

Line 500

Line 501

name = data_blob = NULL;

}

/* successfully parsed all constraints */

/* successfully parsed all options */

ret = 0;

no_port_forwarding_flag |= cert_no_port_forwarding_flag;