diff options
| author | des <des@FreeBSD.org> | 2016-01-21 11:54:34 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-21 11:54:34 +0000 |
| commit | 0c80faa259cc48986b7f44190d4775041aaae6ad (patch) | |
| tree | a7acad41e7fbc545b9d7456a0c51253a7dd802f6 /crypto/openssh/ssh-keygen.c | |
| parent | 65f3eb83cda89352824870422764082e1e79ddc6 (diff) | |
| download | FreeBSD-src-0c80faa259cc48986b7f44190d4775041aaae6ad.zip FreeBSD-src-0c80faa259cc48986b7f44190d4775041aaae6ad.tar.gz | |
Upgrade to OpenSSH 7.1p2.
Diffstat (limited to 'crypto/openssh/ssh-keygen.c')
| -rw-r--r-- | crypto/openssh/ssh-keygen.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssh/ssh-keygen.c b/crypto/openssh/ssh-keygen.c index ea5f1e4..4e0a855 100644 --- a/crypto/openssh/ssh-keygen.c +++ b/crypto/openssh/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.276 2015/07/03 03:49:45 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.277 2015/08/19 23:17:51 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1201,7 +1201,8 @@ do_known_hosts(struct passwd *pw, const char *name) exit(1); } else if (delete_host && !ctx.found_key) { logit("Host %s not found in %s", name, identity_file); - unlink(tmp); + if (inplace) + unlink(tmp); } else if (inplace) { /* Backup existing file */ if (unlink(old) == -1 && errno != ENOENT) |
