- char z = 0;
- char *p;
- sk_write(s, &z, 1);
- sk_write(s, cfg.localusername, strlen(cfg.localusername));
- sk_write(s, &z, 1);
- sk_write(s, cfg.username, strlen(cfg.username));
- sk_write(s, &z, 1);
- sk_write(s, cfg.termtype, strlen(cfg.termtype));
- sk_write(s, "/", 1);
- for(p = cfg.termspeed; isdigit(*p); p++);
- sk_write(s, cfg.termspeed, p - cfg.termspeed);
- sk_write(s, &z, 1);
+ char z = 0;
+ char *p;
+ char ruser[sizeof(cfg->username)];
+ (void) get_remote_username(cfg, ruser, sizeof(ruser));
+ sk_write(rlogin->s, &z, 1);
+ sk_write(rlogin->s, cfg->localusername,
+ strlen(cfg->localusername));
+ sk_write(rlogin->s, &z, 1);
+ sk_write(rlogin->s, ruser,
+ strlen(ruser));
+ sk_write(rlogin->s, &z, 1);
+ sk_write(rlogin->s, cfg->termtype,
+ strlen(cfg->termtype));
+ sk_write(rlogin->s, "/", 1);
+ for (p = cfg->termspeed; isdigit((unsigned char)*p); p++) continue;
+ sk_write(rlogin->s, cfg->termspeed, p - cfg->termspeed);
+ rlogin->bufsize = sk_write(rlogin->s, &z, 1);
+ }
+
+ if (*cfg->loghost) {
+ char *colon;
+
+ sfree(*realhost);
+ *realhost = dupstr(cfg->loghost);
+ colon = strrchr(*realhost, ':');
+ if (colon) {
+ /*
+ * FIXME: if we ever update this aspect of ssh.c for
+ * IPv6 literal management, this should change in line
+ * with it.
+ */
+ *colon++ = '\0';
+ }