src/usr.bin/ssh/sshconnect2.c - diff - 1.150

Return to sshconnect2.c CVS log

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

Diff for /src/usr.bin/ssh/sshconnect2.c between version 1.149 and 1.150

version 1.149, 2006/03/19 18:51:19

version 1.150, 2006/03/25 00:05:41

Line 1028

Line 1028

if (key && key->type == KEY_RSA1)

if (key && key->type == KEY_RSA1)

continue;

continue;

options.identity_keys[i] = NULL;

options.identity_keys[i] = NULL;

id = xmalloc(sizeof(*id));

id = xcalloc(1, sizeof(*id));

memset(id, 0, sizeof(*id));

id->key = key;

id->key = key;

id->filename = xstrdup(options.identity_files[i]);

id->filename = xstrdup(options.identity_files[i]);

TAILQ_INSERT_TAIL(&files, id, next);

TAILQ_INSERT_TAIL(&files, id, next);

Line 1053

Line 1052

}

}

}

}

if (!found && !options.identities_only) {

if (!found && !options.identities_only) {

id = xmalloc(sizeof(*id));

id = xcalloc(1, sizeof(*id));

memset(id, 0, sizeof(*id));

id->key = key;

id->key = key;

id->filename = comment;

id->filename = comment;

id->ac = ac;

id->ac = ac;

Line 1335

Line 1333

return 0;

return 0;

}

}

len = strlen(p) + 2;

len = strlen(p) + 2;

chost = xmalloc(len);

xasprintf(&chost, "%s.", p);

strlcpy(chost, p, len);

strlcat(chost, ".", len);

debug2("userauth_hostbased: chost %s", chost);

debug2("userauth_hostbased: chost %s", chost);

xfree(p);

xfree(p);