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

Return to auth2.c CVS log

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

Diff for /src/usr.bin/ssh/auth2.c between version 1.9 and 1.10

version 1.9, 2000/06/18 01:09:10

version 1.10, 2000/06/18 04:05:02

Line 54

#include "dsa.h"

#include "uidswap.h"

#include "auth-options.h"

/* import */

extern ServerOptions options;

Line 444

Line 445

found = key_new(KEY_DSA);

while (fgets(line, sizeof(line), f)) {

char *cp;

char *cp, *options = NULL;

linenum++;

/* Skip leading whitespace, empty and comment lines. */

for (cp = line; *cp == ' ' || *cp == '\t'; cp++)

;

if (!*cp || *cp == '\n' || *cp == '#')

continue;

bits = key_read(found, &cp);

if (bits == 0)

if (bits == 0) {

continue;

/* no key? check if there are options for this key */

if (key_equal(found, key)) {

int quoted = 0;

options = cp;

for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {

if (*cp == '\\' && cp[1] == '"')

cp++; /* Skip both */

else if (*cp == '"')

quoted = !quoted;

}

/* Skip remaining whitespace. */

for (; *cp == ' ' || *cp == '\t'; cp++)

;

bits = key_read(found, &cp);

if (bits == 0) {

/* still no key? advance to next line*/

continue;

}

if (key_equal(found, key) &&

auth_parse_options(pw, options, linenum) == 1) {

found_key = 1;

debug("matching key found: file %s, line %ld",

file, linenum);