Skip to content
Browse files

When giving authorisation errors from the proxy code in x11fwd.c,

name the proxy using the global 'appname' variable, instead of
statically calling it PuTTY.

(Knock-on effect is that PSCP and PSFTP have to declare that
variable, though of course they shouldn't ever actually _use_ the X
forwarding code. Probably I ought to replace it with a stub
nox11fwd.c for those applications.)


git-svn-id: svn://svn.tartarus.org/sgt/putty@8501 cda61777-01e9-0310-a592-d414129be87e
  • Loading branch information...
1 parent 09d133f commit 42704c978b868f9c1a6b9f94580ab57162d55def simon committed Apr 23, 2009
Showing with 5 additions and 1 deletion.
  1. +2 −0 pscp.c
  2. +2 −0 psftp.c
  3. +1 −1 x11fwd.c
View
2 pscp.c
@@ -50,6 +50,8 @@ static void source(char *src);
static void rsource(char *src);
static void sink(char *targ, char *src);
+const char *const appname = "PSCP";
+
/*
* The maximum amount of queued data we accept before we stop and
* wait for the server to process some.
View
2 psftp.c
@@ -16,6 +16,8 @@
#include "sftp.h"
#include "int64.h"
+const char *const appname = "PSFTP";
+
/*
* Since SFTP is a request-response oriented protocol, it requires
* no buffer management: when we send data, we stop and wait for an
View
2 x11fwd.c
@@ -712,7 +712,7 @@ int x11_send(Socket s, char *data, int len)
int msglen, msgsize;
unsigned char *reply;
- message = dupprintf("PuTTY X11 proxy: %s", err);
+ message = dupprintf("%s X11 proxy: %s", appname, err);
msglen = strlen(message);
reply = snewn(8 + msglen+1 + 4, unsigned char); /* include zero */
msgsize = (msglen + 3) & ~3;

0 comments on commit 42704c9

Please sign in to comment.
Something went wrong with that request. Please try again.