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

Return to ssh.c CVS log

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

version 1.305, 2007/10/29 06:54:50

version 1.306, 2007/11/03 01:24:06

Line 1211

load_public_identity_files(void)

{

char *filename, *cp, thishost[NI_MAXHOST];

char *pwdir = NULL, *pwname = NULL;

int i = 0;

Key *public;

struct passwd *pw;

Line 1239

Line 1240

#endif /* SMARTCARD */

if ((pw = getpwuid(original_real_uid)) == NULL)

fatal("load_public_identity_files: getpwuid failed");

pwname = strdup(pw->pw_name);

pwdir = strdup(pw->pw_dir);

if (gethostname(thishost, sizeof(thishost)) == -1)

fatal("load_public_identity_files: gethostname: %s",

strerror(errno));

for (; i < options.num_identity_files; i++) {

cp = tilde_expand_filename(options.identity_files[i],

original_real_uid);

filename = percent_expand(cp, "d", pw->pw_dir,

filename = percent_expand(cp, "d", pwdir,

"u", pw->pw_name, "l", thishost, "h", host,

"u", pwname, "l", thishost, "h", host,

"r", options.user, (char *)NULL);

xfree(cp);

public = key_load_public(filename, NULL);

Line 1256

Line 1259

options.identity_files[i] = filename;

options.identity_keys[i] = public;

}

bzero(pwname, strlen(pwname));

free(pwname);

bzero(pwdir, strlen(pwdir));

free(pwdir);

}

static void