~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set some parent windows on PuTTYgen and Pageant About/Licence dialog to
[sgt/putty]
/
x11fwd.c
diff --git
a/x11fwd.c
b/x11fwd.c
index
135c034
..
5467486
100644
(file)
--- a/
x11fwd.c
+++ b/
x11fwd.c
@@
-112,6
+112,12
@@
void *x11_invent_auth(char *proto, int protomaxlen,
return auth;
}
return auth;
}
+void x11_free_auth(void *auth)
+{
+
+ sfree(auth);
+}
+
/*
* Fetch the real auth data for a given display string, and store
* it in an X11Auth structure. Returns NULL on success, or an error
/*
* Fetch the real auth data for a given display string, and store
* it in an X11Auth structure. Returns NULL on success, or an error
@@
-227,7
+233,7
@@
int x11_get_screen_number(char *display)
* also, fills the SocketsStructure
*/
char *x11_init(Socket * s, char *display, void *c, void *auth,
* also, fills the SocketsStructure
*/
char *x11_init(Socket * s, char *display, void *c, void *auth,
- const char *peeraddr, int peerport)
+ const char *peeraddr, int peerport
, const Config *cfg
)
{
static const struct plug_function_table fn_table = {
x11_closing,
{
static const struct plug_function_table fn_table = {
x11_closing,
@@
-269,7
+275,7
@@
char *x11_init(Socket * s, char *display, void *c, void *auth,
/*
* Try to find host.
*/
/*
* Try to find host.
*/
- addr = name_lookup(host, port, &dummy_realhost);
+ addr = name_lookup(host, port, &dummy_realhost
, cfg
);
if ((err = sk_addr_error(addr)) != NULL)
return err;
if ((err = sk_addr_error(addr)) != NULL)
return err;
@@
-285,7
+291,8
@@
char *x11_init(Socket * s, char *display, void *c, void *auth,
pr->throttled = pr->throttle_override = 0;
pr->c = c;
pr->throttled = pr->throttle_override = 0;
pr->c = c;
- pr->s = *s = new_connection(addr, dummy_realhost, port, 0, 1, 0, (Plug) pr);
+ pr->s = *s = new_connection(addr, dummy_realhost, port,
+ 0, 1, 0, (Plug) pr, cfg);
if ((err = sk_socket_error(*s)) != NULL) {
sfree(pr);
return err;
if ((err = sk_socket_error(*s)) != NULL) {
sfree(pr);
return err;