diff options
| author | jp161948 <none@none> | 2007-08-20 13:43:28 -0700 |
|---|---|---|
| committer | jp161948 <none@none> | 2007-08-20 13:43:28 -0700 |
| commit | 383a1232abf6ee8c176a61ee5268f51bb9840224 (patch) | |
| tree | b3c05da23ff3f0c1dfdd40b4e52a4835e1efb03c /usr/src/cmd/ssh/include | |
| parent | 02b636c64ad657301ef5f5e6c2d14c6bec693fff (diff) | |
| download | illumos-joyent-383a1232abf6ee8c176a61ee5268f51bb9840224.tar.gz | |
PSARC/2007/034 ssh/sshd resync with OpenSSH
6472998 implement untrusted X11 forwarding in ssh(1)
Diffstat (limited to 'usr/src/cmd/ssh/include')
| -rw-r--r-- | usr/src/cmd/ssh/include/channels.h | 3 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/include/clientloop.h | 2 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/include/misc.h | 3 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/include/readconf.h | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/usr/src/cmd/ssh/include/channels.h b/usr/src/cmd/ssh/include/channels.h index 806d9cf205..449f7a6640 100644 --- a/usr/src/cmd/ssh/include/channels.h +++ b/usr/src/cmd/ssh/include/channels.h @@ -225,7 +225,8 @@ int channel_setup_remote_fwd_listener(const char *, u_short, int); int x11_connect_display(void); int x11_create_display_inet(int, int, int, u_int *); void x11_input_open(int, u_int32_t, void *); -void x11_request_forwarding_with_spoofing(int, const char *, const char *); +void x11_request_forwarding_with_spoofing(int, const char *, const char *, + const char *); void deny_input_open(int, u_int32_t, void *); /* agent forwarding */ diff --git a/usr/src/cmd/ssh/include/clientloop.h b/usr/src/cmd/ssh/include/clientloop.h index 6eb2e4c0fe..5e24594195 100644 --- a/usr/src/cmd/ssh/include/clientloop.h +++ b/usr/src/cmd/ssh/include/clientloop.h @@ -47,6 +47,8 @@ extern "C" { /* Client side main loop for the interactive session. */ int client_loop(int, int, int); +void client_x11_get_proto(const char *, const char *, u_int, + char **, char **); void client_global_request_reply_fwd(int type, u_int32_t seq, void *ctxt); #ifdef __cplusplus diff --git a/usr/src/cmd/ssh/include/misc.h b/usr/src/cmd/ssh/include/misc.h index ae506c324f..eb9a805dd6 100644 --- a/usr/src/cmd/ssh/include/misc.h +++ b/usr/src/cmd/ssh/include/misc.h @@ -22,7 +22,7 @@ extern "C" { * called by a name other than "ssh" or "Secure Shell". */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -35,6 +35,7 @@ int a2port(const char *); char *cleanhostname(char *); char *colon(char *); long convtime(const char *); +char *tohex(const void *, size_t); struct passwd *pwcopy(struct passwd *); void pwfree(struct passwd **); diff --git a/usr/src/cmd/ssh/include/readconf.h b/usr/src/cmd/ssh/include/readconf.h index 687bf48172..87440a30dc 100644 --- a/usr/src/cmd/ssh/include/readconf.h +++ b/usr/src/cmd/ssh/include/readconf.h @@ -41,6 +41,7 @@ typedef struct { typedef struct { int forward_agent; /* Forward authentication agent. */ int forward_x11; /* Forward X11 display. */ + int forward_x11_trusted; /* Trust Forward X11 display. */ char *xauth_location; /* Location for xauth program */ int gateway_ports; /* Allow remote connects to forwarded ports. */ int use_privileged_port; /* Don't use privileged port if false. */ |