upstream commit
moar whitespace at eol Upstream-ID: 64eaf872a3ba52ed41e494287e80d40aaba4b515
This commit is contained in:
parent
2b64c49046
commit
c28a3436fa
|
@ -1,4 +1,4 @@
|
||||||
/* $OpenBSD: channels.h,v 1.116 2015/01/19 20:07:45 markus Exp $ */
|
/* $OpenBSD: channels.h,v 1.117 2015/05/08 06:45:13 djm Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
|
@ -113,7 +113,7 @@ struct Channel {
|
||||||
time_t notbefore; /* Pause IO until deadline (time_t) */
|
time_t notbefore; /* Pause IO until deadline (time_t) */
|
||||||
int delayed; /* post-select handlers for newly created
|
int delayed; /* post-select handlers for newly created
|
||||||
* channels are delayed until the first call
|
* channels are delayed until the first call
|
||||||
* to a matching pre-select handler.
|
* to a matching pre-select handler.
|
||||||
* this way post-select handlers are not
|
* this way post-select handlers are not
|
||||||
* accidentally called if a FD gets reused */
|
* accidentally called if a FD gets reused */
|
||||||
Buffer input; /* data read from socket, to be sent over
|
Buffer input; /* data read from socket, to be sent over
|
||||||
|
|
4
dns.h
4
dns.h
|
@ -1,4 +1,4 @@
|
||||||
/* $OpenBSD: dns.h,v 1.14 2015/01/15 09:40:00 djm Exp $ */
|
/* $OpenBSD: dns.h,v 1.15 2015/05/08 06:45:13 djm Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2003 Wesley Griffin. All rights reserved.
|
* Copyright (c) 2003 Wesley Griffin. All rights reserved.
|
||||||
|
@ -33,7 +33,7 @@ enum sshfp_types {
|
||||||
SSHFP_KEY_RSA = 1,
|
SSHFP_KEY_RSA = 1,
|
||||||
SSHFP_KEY_DSA = 2,
|
SSHFP_KEY_DSA = 2,
|
||||||
SSHFP_KEY_ECDSA = 3,
|
SSHFP_KEY_ECDSA = 3,
|
||||||
SSHFP_KEY_ED25519 = 4
|
SSHFP_KEY_ED25519 = 4
|
||||||
};
|
};
|
||||||
|
|
||||||
enum sshfp_hashes {
|
enum sshfp_hashes {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $OpenBSD: sftp-client.h,v 1.26 2015/01/14 13:54:13 djm Exp $ */
|
/* $OpenBSD: sftp-client.h,v 1.27 2015/05/08 06:45:13 djm Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
|
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
|
||||||
|
@ -111,7 +111,7 @@ int do_download(struct sftp_conn *, const char *, const char *,
|
||||||
Attrib *, int, int, int);
|
Attrib *, int, int, int);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Recursively download 'remote_directory' to 'local_directory'. Preserve
|
* Recursively download 'remote_directory' to 'local_directory'. Preserve
|
||||||
* times if 'pflag' is set
|
* times if 'pflag' is set
|
||||||
*/
|
*/
|
||||||
int download_dir(struct sftp_conn *, const char *, const char *,
|
int download_dir(struct sftp_conn *, const char *, const char *,
|
||||||
|
@ -124,7 +124,7 @@ int download_dir(struct sftp_conn *, const char *, const char *,
|
||||||
int do_upload(struct sftp_conn *, const char *, const char *, int, int, int);
|
int do_upload(struct sftp_conn *, const char *, const char *, int, int, int);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Recursively upload 'local_directory' to 'remote_directory'. Preserve
|
* Recursively upload 'local_directory' to 'remote_directory'. Preserve
|
||||||
* times if 'pflag' is set
|
* times if 'pflag' is set
|
||||||
*/
|
*/
|
||||||
int upload_dir(struct sftp_conn *, const char *, const char *, int, int, int,
|
int upload_dir(struct sftp_conn *, const char *, const char *, int, int, int,
|
||||||
|
|
Loading…
Reference in New Issue