From c0ff298e15244d14512f53eb48734851dc93eadd Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Thu, 8 Feb 2001 16:07:28 +0000
Subject: [PATCH] (startslave, start_login): re-write code to keep track both
 of remote hostname and utmp string to be used

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9660 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/telnet/telnetd/sys_term.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/appl/telnet/telnetd/sys_term.c b/appl/telnet/telnetd/sys_term.c
index 31bf0175a..59c4282f8 100644
--- a/appl/telnet/telnetd/sys_term.c
+++ b/appl/telnet/telnetd/sys_term.c
@@ -1110,7 +1110,8 @@ make_id (char *tty)
 
 /* ARGSUSED */
 void
-startslave(char *host, int autologin, char *autoname)
+startslave(const char *host, const char *utmp_host,
+	   int autologin, char *autoname)
 {
     int i;
 
@@ -1158,7 +1159,7 @@ startslave(char *host, int autologin, char *autoname)
 	wtmp.ut_type = LOGIN_PROCESS;
 	wtmp.ut_pid = pid;
 	strncpy(wtmp.ut_user,  "LOGIN", sizeof(wtmp.ut_user));
-	strncpy(wtmp.ut_host,  host, sizeof(wtmp.ut_host));
+	strncpy(wtmp.ut_host,  utmp_host, sizeof(wtmp.ut_host));
 	strncpy(wtmp.ut_line,  clean_ttyname(line), sizeof(wtmp.ut_line));
 #ifdef HAVE_STRUCT_UTMP_UT_ID
 	strncpy(wtmp.ut_id, wtmp.ut_line + 3, sizeof(wtmp.ut_id));
@@ -1192,7 +1193,6 @@ extern char **environ;
 void
 init_env(void)
 {
-    extern char *getenv(const char *);
     char **envp;
 
     envp = envinit;
@@ -1262,7 +1262,7 @@ struct arg_val {
     char **argv;
 };
 
-static void addarg(struct arg_val*, char*);
+static void addarg(struct arg_val*, const char*);
 
 /*
  * start_login(host)
@@ -1272,7 +1272,7 @@ static void addarg(struct arg_val*, char*);
  */
 
 void
-start_login(char *host, int autologin, char *name)
+start_login(const char *host, int autologin, char *name)
 {
     struct arg_val argv;
     char *user;
@@ -1378,7 +1378,7 @@ start_login(char *host, int autologin, char *name)
 }
 
 static void
-addarg(struct arg_val *argv, char *val)
+addarg(struct arg_val *argv, const char *val)
 {
     if(argv->size <= argv->argc+1) {
 	argv->argv = realloc(argv->argv, sizeof(char*) * (argv->size + 10));