diff options
| author |   djm <djm@openbsd.org> | 2020-05-13 09:55:57 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-05-13 09:55:57 +0000 |
| commit | 1b29bac52f07c2a779753a6c5dfaa8c2da291713 (patch) | |
| tree | aaffb3f325e728bed772c6110898fef6e03ae6aa /usr.bin/ssh/ssh-keygen.c | |
| parent | when ordering the hostkey algorithms to request from a server, (diff) | |
| download | wireguard-openbsd-1b29bac52f07c2a779753a6c5dfaa8c2da291713.tar.xz wireguard-openbsd-1b29bac52f07c2a779753a6c5dfaa8c2da291713.zip | |
preserve group/world read permission on known_hosts file across runs of
"ssh-keygen -Rf /path". The old behaviour was to remove all rights for
group/other. bz#3146 ok dtucker@
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index 02cdd276fc9..53e32bab905 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.409 2020/05/02 07:19:43 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.410 2020/05/13 09:55:57 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1270,6 +1270,7 @@ do_known_hosts(struct passwd *pw, const char *name, int find_host, int r, fd, oerrno, inplace = 0; struct known_hosts_ctx ctx; u_int foreach_options; + struct stat sb; if (!have_identity) { cp = tilde_expand_filename(_PATH_SSH_USER_HOSTFILE, pw->pw_uid); @@ -1279,6 +1280,8 @@ do_known_hosts(struct passwd *pw, const char *name, int find_host, free(cp); have_identity = 1; } + if (stat(identity_file, &sb) != 0) + fatal("Cannot stat %s: %s", identity_file, strerror(errno)); memset(&ctx, 0, sizeof(ctx)); ctx.out = stdout; @@ -1305,6 +1308,7 @@ do_known_hosts(struct passwd *pw, const char *name, int find_host, unlink(tmp); fatal("fdopen: %s", strerror(oerrno)); } + fchmod(fd, sb.st_mode & 0644); inplace = 1; } /* XXX support identity_file == "-" for stdin */ |