summaryrefslogtreecommitdiff
path: root/usr/src/cmd/ssh/include
diff options
context:
space:
mode:
authorjp161948 <none@none>2007-07-16 11:49:21 -0700
committerjp161948 <none@none>2007-07-16 11:49:21 -0700
commit1434cf017a8db809c71ef511272abf5c104b52d8 (patch)
treefa8841aac18f09da1d1e0c168dcb69428f0265d6 /usr/src/cmd/ssh/include
parent5cff782560a1c3cf913ba5574a5123a299f3315e (diff)
downloadillumos-joyent-1434cf017a8db809c71ef511272abf5c104b52d8.tar.gz
PSARC/2007/034 ssh/sshd resync with OpenSSH
6268400 resync ServerAlive functionality
Diffstat (limited to 'usr/src/cmd/ssh/include')
-rw-r--r--usr/src/cmd/ssh/include/clientloop.h2
-rw-r--r--usr/src/cmd/ssh/include/readconf.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/usr/src/cmd/ssh/include/clientloop.h b/usr/src/cmd/ssh/include/clientloop.h
index 584c354d1b..6eb2e4c0fe 100644
--- a/usr/src/cmd/ssh/include/clientloop.h
+++ b/usr/src/cmd/ssh/include/clientloop.h
@@ -47,7 +47,7 @@ extern "C" {
/* Client side main loop for the interactive session. */
int client_loop(int, int, int);
-void client_global_request_reply(int type, u_int32_t seq, void *ctxt);
+void client_global_request_reply_fwd(int type, u_int32_t seq, void *ctxt);
#ifdef __cplusplus
}
diff --git a/usr/src/cmd/ssh/include/readconf.h b/usr/src/cmd/ssh/include/readconf.h
index 52d2f7100b..687bf48172 100644
--- a/usr/src/cmd/ssh/include/readconf.h
+++ b/usr/src/cmd/ssh/include/readconf.h
@@ -125,6 +125,8 @@ typedef struct {
Forward remote_forwards[SSH_MAX_FORWARDS_PER_DIRECTION];
int clear_forwardings;
int no_host_authentication_for_localhost;
+ int server_alive_interval;
+ int server_alive_count_max;
} Options;