nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-02-03 21:52:24 +00:00
Code Issues Projects Releases Wiki Activity

Remove the entirely pointless fourth parameter from x11_init().

Browse Source 
[originally from svn r889]
This commit is contained in:
Simon Tatham 2001-01-23 11:02:02 +00:00
parent c171bb0a2c
commit 1eb0308ad7
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssh.c
View File

@ -165,7 +165,7 @@ extern const struct ssh_cipher ssh_des;
extern const struct ssh_cipher ssh_blowfish_ssh1; extern const struct ssh_cipher ssh_blowfish_ssh1;
extern const struct ssh_cipher ssh_blowfish_ssh2; extern const struct ssh_cipher ssh_blowfish_ssh2;
extern char *x11_init (Socket *, char *, void *, char **); extern char *x11_init (Socket *, char *, void *);
extern void x11_close (Socket); extern void x11_close (Socket);
extern void x11_send (Socket , char *, int); extern void x11_send (Socket , char *, int);
extern void x11_invent_auth(char *, int, char *, int); extern void x11_invent_auth(char *, int, char *, int);
@ -1896,11 +1896,9 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) {
PKT_END); PKT_END);
logevent("Rejected X11 connect request"); logevent("Rejected X11 connect request");
} else { } else {
char *rh;
c = smalloc(sizeof(struct ssh_channel)); c = smalloc(sizeof(struct ssh_channel));
if ( x11_init(&c->u.x11.s, cfg.x11_display, c, &rh) != NULL ) { if ( x11_init(&c->u.x11.s, cfg.x11_display, c) != NULL ) {
logevent("opening X11 forward connection failed"); logevent("opening X11 forward connection failed");
sfree(c); sfree(c);
send_packet(SSH1_MSG_CHANNEL_OPEN_FAILURE, send_packet(SSH1_MSG_CHANNEL_OPEN_FAILURE,
@ -2908,10 +2906,9 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
c = smalloc(sizeof(struct ssh_channel)); c = smalloc(sizeof(struct ssh_channel));
if (typelen == 3 && !memcmp(type, "x11", 3)) { if (typelen == 3 && !memcmp(type, "x11", 3)) {
char *rh;
if (!ssh_X11_fwd_enabled) if (!ssh_X11_fwd_enabled)
error = "X11 forwarding is not enabled"; error = "X11 forwarding is not enabled";
else if ( x11_init(&c->u.x11.s, cfg.x11_display, c, &rh) != NULL ) { else if ( x11_init(&c->u.x11.s, cfg.x11_display, c) != NULL ) {
error = "Unable to open an X11 connection"; error = "Unable to open an X11 connection";
} else { } else {
c->type = CHAN_X11; c->type = CHAN_X11;

8
x11fwd.c
View File

@ -121,13 +121,11 @@ static int x11_receive (Socket s, int urgent, char *data, int len) {
* *
* Returns an error message, or NULL on success. * Returns an error message, or NULL on success.
* also, fills the SocketsStructure * also, fills the SocketsStructure
*
* Also places the canonical host name into `realhost'.
*/ */
char *x11_init (Socket *s, char *display, void *c, char **realhost) { char *x11_init (Socket *s, char *display, void *c) {
SockAddr addr; SockAddr addr;
int port; int port;
char *err; char *err, *dummy_realhost;
char host[128]; char host[128];
int n, displaynum; int n, displaynum;
struct X11Private *pr; struct X11Private *pr;
@ -148,7 +146,7 @@ char *x11_init (Socket *s, char *display, void *c, char **realhost) {
/* /*
* Try to find host. * Try to find host.
*/ */
addr = sk_namelookup(host, realhost); addr = sk_namelookup(host, &dummy_realhost);
if ( (err = sk_addr_error(addr)) ) if ( (err = sk_addr_error(addr)) )
return err; return err;