diff options
| author | Huie-Ying Lee <Huie-Ying.Lee@Sun.COM> | 2009-08-12 17:10:27 -0700 |
|---|---|---|
| committer | Huie-Ying Lee <Huie-Ying.Lee@Sun.COM> | 2009-08-12 17:10:27 -0700 |
| commit | ef4d27fba69298571e509867dd27ea8bca349ec9 (patch) | |
| tree | 1eee7aef2eab935482e13bd99c0600c139c91e4f /usr/src/cmd/ssh/include | |
| parent | 2e7d9b4283515cc94f4e29f4b76204b1c108c307 (diff) | |
| download | illumos-joyent-ef4d27fba69298571e509867dd27ea8bca349ec9.tar.gz | |
PSARC 2009/408 resync ssh-agent command with OpenSSH
6860042 resync ssh-agent(1) with OpenSSH
6228970 ssh-agent cannot tolerate stdin being closed
Diffstat (limited to 'usr/src/cmd/ssh/include')
| -rw-r--r-- | usr/src/cmd/ssh/include/authfd.h | 3 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/include/readpass.h | 6 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/include/ssh.h | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/usr/src/cmd/ssh/include/authfd.h b/usr/src/cmd/ssh/include/authfd.h index c9a638f598..81b27cc0e6 100644 --- a/usr/src/cmd/ssh/include/authfd.h +++ b/usr/src/cmd/ssh/include/authfd.h @@ -3,8 +3,6 @@ #ifndef _AUTHFD_H #define _AUTHFD_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -58,6 +56,7 @@ extern "C" { #define SSH2_AGENTC_ADD_ID_CONSTRAINED 25 #define SSH_AGENT_CONSTRAIN_LIFETIME 1 +#define SSH_AGENT_CONSTRAIN_CONFIRM 2 /* extended failure messages */ #define SSH2_AGENT_FAILURE 30 diff --git a/usr/src/cmd/ssh/include/readpass.h b/usr/src/cmd/ssh/include/readpass.h index 0c4279ea28..1917f08e30 100644 --- a/usr/src/cmd/ssh/include/readpass.h +++ b/usr/src/cmd/ssh/include/readpass.h @@ -3,8 +3,6 @@ #ifndef _READPASS_H #define _READPASS_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -25,8 +23,12 @@ extern "C" { #define RP_ECHO 0x0001 #define RP_ALLOW_STDIN 0x0002 #define RP_ALLOW_EOF 0x0004 +#define RP_USE_ASKPASS 0x0008 char *read_passphrase(const char *, int); +int ask_permission(const char *, ...) + __attribute__((format(printf, 1, 2))); +int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); #ifdef __cplusplus } diff --git a/usr/src/cmd/ssh/include/ssh.h b/usr/src/cmd/ssh/include/ssh.h index fce827592b..746d2ff69b 100644 --- a/usr/src/cmd/ssh/include/ssh.h +++ b/usr/src/cmd/ssh/include/ssh.h @@ -3,8 +3,6 @@ #ifndef _SSH_H #define _SSH_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -22,7 +20,7 @@ extern "C" { * called by a name other than "ssh" or "Secure Shell". */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -118,6 +116,9 @@ extern "C" { /* Minimum modulus size (n) for RSA keys. */ #define SSH_RSA_MINIMUM_MODULUS_SIZE 768 +/* Listen backlog for sshd, ssh-agent and forwarding sockets */ +#define SSH_LISTEN_BACKLOG 128 + /* * Do not display banner when in remote command mode only. Note that RFC 4254 * uses "exec" as a mode name for the channel opened for the execution of the |