summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-07-05 04:55:40 +0000
committerDamien Miller <djm@mindrot.org>2019-07-08 11:44:49 +1000
commit569b650f93b561c09c655f83f128e1dfffe74101 (patch)
treef40a1711f9f0cfa063a8acbb70870cdaf1b3d49f /ssh-keygen.c
parentb8e2b797362526437e0642a6c2f2970d794f2561 (diff)
upstream: add a local implementation of BSD realpath() for
sftp-server use ahead of OpenBSD's realpath changing to match POSIX; ok deraadt@ (thanks for snaps testing) OpenBSD-Commit-ID: 4f8cbf7ed8679f6237264301d104ecec64885d55
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r--ssh-keygen.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 3aa4f5125..d00ce494f 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.333 2019/06/28 13:35:04 deraadt Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.334 2019/07/05 04:55:40 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -43,7 +43,6 @@
43#include "xmalloc.h" 43#include "xmalloc.h"
44#include "sshkey.h" 44#include "sshkey.h"
45#include "authfile.h" 45#include "authfile.h"
46#include "uuencode.h"
47#include "sshbuf.h" 46#include "sshbuf.h"
48#include "pathnames.h" 47#include "pathnames.h"
49#include "log.h" 48#include "log.h"