diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-24 16:52:31 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-24 16:52:31 +0100 |
| commit | dce7b34b9f70d28161082e6187c5cb6ea4079060 (patch) | |
| tree | b3b63b028dfc4e4853f71339390eea6fb3f6cc24 /tools/plink/winx11.c | |
| parent | 6ba4c534507676abe7d7ac415cb113cd40953925 (diff) | |
| parent | 6039fd0faf73c9d6c5b2abf9d824734218ec5eee (diff) | |
| download | vcxsrv-dce7b34b9f70d28161082e6187c5cb6ea4079060.tar.gz vcxsrv-dce7b34b9f70d28161082e6187c5cb6ea4079060.tar.bz2 vcxsrv-dce7b34b9f70d28161082e6187c5cb6ea4079060.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
tools/plink/sshbn.c
Diffstat (limited to 'tools/plink/winx11.c')
| -rw-r--r-- | tools/plink/winx11.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/plink/winx11.c b/tools/plink/winx11.c index c8951b086..630fac765 100644 --- a/tools/plink/winx11.c +++ b/tools/plink/winx11.c @@ -9,10 +9,11 @@ #include "putty.h"
#include "ssh.h"
-void platform_get_x11_auth(struct X11Display *disp, const Config *cfg)
+void platform_get_x11_auth(struct X11Display *disp, Conf *conf)
{
- if (cfg->xauthfile.path[0])
- x11_get_auth_from_authfile(disp, cfg->xauthfile.path);
+ char *xauthpath = conf_get_filename(conf, CONF_xauthfile)->path;
+ if (xauthpath[0])
+ x11_get_auth_from_authfile(disp, xauthpath);
}
const int platform_uses_x11_unix_by_default = FALSE;
|