diff options
| author | des <des@FreeBSD.org> | 2016-01-19 16:18:26 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-19 16:18:26 +0000 |
| commit | 14172c52f89fa504003826ed2e4e2c0ac246505d (patch) | |
| tree | bc48bd740145eea64393ed391fc1d972c83f991c /crypto/openssh/sftp-client.h | |
| parent | 456370e53073cd38d0ddc4001283f1c131d1428e (diff) | |
| parent | 64c731d52472fb486558425128009691392e0bef (diff) | |
| download | FreeBSD-src-14172c52f89fa504003826ed2e4e2c0ac246505d.zip FreeBSD-src-14172c52f89fa504003826ed2e4e2c0ac246505d.tar.gz | |
Upgrade to OpenSSH 6.7p1, retaining libwrap support (which has been removed
upstream) and a number of security fixes which we had already backported.
MFC after: 1 week
Diffstat (limited to 'crypto/openssh/sftp-client.h')
| -rw-r--r-- | crypto/openssh/sftp-client.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/sftp-client.h b/crypto/openssh/sftp-client.h index ba92ad0..967840b 100644 --- a/crypto/openssh/sftp-client.h +++ b/crypto/openssh/sftp-client.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.h,v 1.24 2013/10/17 00:30:13 djm Exp $ */ +/* $OpenBSD: sftp-client.h,v 1.25 2014/04/21 14:36:16 logan Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> @@ -120,13 +120,13 @@ int download_dir(struct sftp_conn *, char *, char *, Attrib *, int, * Upload 'local_path' to 'remote_path'. Preserve permissions and times * if 'pflag' is set */ -int do_upload(struct sftp_conn *, char *, char *, int, int); +int do_upload(struct sftp_conn *, char *, char *, int, int, int); /* * Recursively upload 'local_directory' to 'remote_directory'. Preserve * times if 'pflag' is set */ -int upload_dir(struct sftp_conn *, char *, char *, int, int, int); +int upload_dir(struct sftp_conn *, char *, char *, int, int, int, int); /* Concatenate paths, taking care of slashes. Caller must free result. */ char *path_append(char *, char *); |
