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

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.216 and 1.217

version 1.216, 2012/07/06 06:38:03

version 1.217, 2012/08/17 01:25:58

Line 1073

Line 1073

ca ? " (CA key)" : "");

ca ? " (CA key)" : "");

printhost(out, cp, pub, ca, 0);

printhost(out, cp, pub, ca, 0);

}

}

if (delete_host && !c && !ca)

if (delete_host) {

printhost(out, cp, pub, ca, 0);

if (!c && !ca)

printhost(out, cp, pub, ca, 0);

else

printf("# Host %s found: "

"line %d type %s\n", name,

num, key_type(pub));

}

} else if (hash_hosts)

} else if (hash_hosts)

printhost(out, cp, pub, ca, 0);

printhost(out, cp, pub, ca, 0);

} else {

} else {

Line 1089

Line 1095

printhost(out, name, pub,

printhost(out, name, pub,

ca, hash_hosts && !ca);

ca, hash_hosts && !ca);

}

}

if (delete_host && !c && !ca)

if (delete_host) {

printhost(out, cp, pub, ca, 0);

if (!c && !ca)

printhost(out, cp, pub, ca, 0);

else

printf("# Host %s found: "

"line %d type %s\n", name,

num, key_type(pub));

}

} else if (hash_hosts) {

} else if (hash_hosts) {

for (cp2 = strsep(&cp, ",");

for (cp2 = strsep(&cp, ",");

cp2 != NULL && *cp2 != '\0';

cp2 != NULL && *cp2 != '\0';