From 277fc55e202f0ec3c76b52c40e1ee49dbca365cb Mon Sep 17 00:00:00 2001 From: jacob Date: Thu, 12 Sep 2002 16:05:05 +0000 Subject: [PATCH] Semi-bug "long-usernames": Bump username storage from 32 to 100 chars. Also replaced a couple of magic numbers with sizeof in ssh.c. I don't believe this is going to startle any of the protocols PuTTY talks. git-svn-id: svn://svn.tartarus.org/sgt/putty@1952 cda61777-01e9-0310-a592-d414129be87e --- putty.h | 4 ++-- ssh.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/putty.h b/putty.h index e98bd7da..e2a7fea7 100644 --- a/putty.h +++ b/putty.h @@ -276,8 +276,8 @@ typedef struct { char termtype[32]; char termspeed[32]; char environmt[1024]; /* VAR\tvalue\0VAR\tvalue\0\0 */ - char username[32]; - char localusername[32]; + char username[100]; + char localusername[100]; int rfc_environ; int passive_telnet; /* Keyboard options */ diff --git a/ssh.c b/ssh.c index 58b6b427..b2859651 100644 --- a/ssh.c +++ b/ssh.c @@ -2362,8 +2362,8 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt) c_write_str("\r\n"); } } else { - strncpy(username, cfg.username, 99); - username[99] = '\0'; + strncpy(username, cfg.username, sizeof(username)); + username[sizeof(username)-1] = '\0'; } send_packet(SSH1_CMSG_USER, PKT_STR, username, PKT_END); @@ -4182,8 +4182,8 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt) username[strcspn(username, "\n\r")] = '\0'; } else { char stuff[200]; - strncpy(username, cfg.username, 99); - username[99] = '\0'; + strncpy(username, cfg.username, sizeof(username)); + username[sizeof(username)-1] = '\0'; if ((flags & FLAG_VERBOSE) || (flags & FLAG_INTERACTIVE)) { sprintf(stuff, "Using username \"%s\".\r\n", username); c_write_str(stuff); -- 2.11.0