From ac187a8194cc6816be20814fe6636b88a513d971 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Tue, 24 Jul 2018 13:40:42 +0200
Subject: [PATCH] openssh: Fix some merging mistakes I made.

---
 crypto/openssh/README.DELETED | 112 ++++++++++++++++++++++++++++++++++++++++++
 crypto/openssh/session.c      |   6 ++-
 crypto/openssh/sftp-common.c  |   2 +-
 3 files changed, 118 insertions(+), 2 deletions(-)
 create mode 100644 crypto/openssh/README.DELETED

diff --git a/crypto/openssh/README.DELETED b/crypto/openssh/README.DELETED
new file mode 100644
index 0000000000..3d0fc52ddf
--- /dev/null
+++ b/crypto/openssh/README.DELETED
@@ -0,0 +1,112 @@
+.gitignore
+.skipped-commit-ids
+ChangeLog
+INSTALL
+Makefile.in
+OVERVIEW
+README.platform
+README.privsep
+TODO
+aclocal.m4
+audit-linux.c
+buildpkg.sh.in
+cipher-aesctr.c
+config.guess
+config.h.in
+config.sub
+configure
+configure.ac
+contrib/
+digest-libc.c
+fixalgorithms
+fixpaths
+fixprogs
+install-sh
+logintest.c
+mdoc2man.awk
+mkinstalldirs
+moduli.0
+nchan.ms
+nchan2.ms
+openbsd-compat/Makefile.in
+openbsd-compat/arc4random.c
+openbsd-compat/base64.c
+openbsd-compat/basename.c
+openbsd-compat/bindresvport.c
+openbsd-compat/bsd-asprintf.c
+openbsd-compat/bsd-closefrom.c
+openbsd-compat/bsd-cray.c
+openbsd-compat/bsd-cygwin_util.c
+openbsd-compat/bsd-err.c
+openbsd-compat/bsd-getpeereid.c
+openbsd-compat/bsd-nextstep.c
+openbsd-compat/bsd-openpty.c
+openbsd-compat/bsd-poll.c
+openbsd-compat/bsd-setres_id.c
+openbsd-compat/bsd-snprintf.c
+openbsd-compat/bsd-statvfs.c
+openbsd-compat/bsd-waitpid.c
+openbsd-compat/chacha_private.h
+openbsd-compat/daemon.c
+openbsd-compat/dirname.c
+openbsd-compat/fake-rfc2553.c
+openbsd-compat/getcwd.c
+openbsd-compat/getgrouplist.c
+openbsd-compat/getopt.h
+openbsd-compat/getopt_long.c
+openbsd-compat/getrrsetbyname-ldns.c
+openbsd-compat/inet_aton.c
+openbsd-compat/inet_ntoa.c
+openbsd-compat/inet_ntop.c
+openbsd-compat/kludge-fd_set.c
+openbsd-compat/mktemp.c
+openbsd-compat/port-aix.c
+openbsd-compat/port-irix.c
+openbsd-compat/port-linux.c
+openbsd-compat/port-solaris.c
+openbsd-compat/port-uw.c
+openbsd-compat/pwcache.c
+openbsd-compat/readpassphrase.c
+openbsd-compat/regress/
+openbsd-compat/rresvport.c
+openbsd-compat/setenv.c
+openbsd-compat/setproctitle.c
+openbsd-compat/sha2.c
+openbsd-compat/sigact.c
+openbsd-compat/strlcat.c
+openbsd-compat/strlcpy.c
+openbsd-compat/strmode.c
+openbsd-compat/strnlen.c
+openbsd-compat/strptime.c
+openbsd-compat/strsep.c
+openbsd-compat/strtoll.c
+openbsd-compat/strtonum.c
+openbsd-compat/strtoul.c
+openbsd-compat/strtoull.c
+openbsd-compat/vis.c
+openbsd-compat/vis.h
+openbsd-compat/xcrypt.c
+openssh.xml.in
+opensshd.init.in
+regress/
+sandbox-capsicum.c
+sandbox-darwin.c
+sandbox-null.c
+sandbox-pledge.c
+sandbox-seccomp-filter.c
+sandbox-solaris.c
+sandbox-systrace.c
+scp.0
+sftp-server.0
+sftp.0
+ssh-add.0
+ssh-agent.0
+ssh-keygen.0
+ssh-keyscan.0
+ssh-keysign.0
+ssh-pkcs11-helper.0
+ssh.0
+ssh_config.0
+sshd.0
+sshd_config.0
+survey.sh.in
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c
index 09978a7dff..9bcdbf1ed3 100644
--- a/crypto/openssh/session.c
+++ b/crypto/openssh/session.c
@@ -951,12 +951,16 @@ copy_environment_blacklist(char **source, char ***env, u_int *envsize,
 	}
 }
 
-void
+#ifdef HAVE_CYGWIN
+
+static void
 copy_environment(char **source, char ***env, u_int *envsize)
 {
 	copy_environment_blacklist(source, env, envsize, NULL);
 }
 
+#endif
+
 static char **
 do_setup_env(struct ssh *ssh, Session *s, const char *shell)
 {
diff --git a/crypto/openssh/sftp-common.c b/crypto/openssh/sftp-common.c
index 13a7f5becc..ccc3bce02d 100644
--- a/crypto/openssh/sftp-common.c
+++ b/crypto/openssh/sftp-common.c
@@ -215,7 +215,7 @@ ls_file(const char *name, const struct stat *st, int remote, int si_units)
 {
 	int ulen, glen, sz = 0;
 	struct tm *ltime = localtime(&st->st_mtime);
-	char *user, *group;
+	const char *user, *group;
 	char buf[1024], lc[8], mode[11+1], tbuf[12+1], ubuf[11+1], gbuf[11+1];
 	char sbuf[FMT_SCALED_STRSIZE];
 	time_t now;
-- 
2.11.4.GIT