oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Fix for duplicate `-- user'.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3501 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-09-17 19:28:02 +00:00
parent 501d17bd31
commit 2c71d0405b
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
appl/telnet/telnetd/sys_term.c
View File

@@ -1252,6 +1252,7 @@ void start_login(char *host, int autologin, char *name)
struct utmpx utmpx; struct utmpx utmpx;
struct timeval tmp; struct timeval tmp;
char *clean_tty; char *clean_tty;
char *user;
/* /*
* Create utmp entry for child * Create utmp entry for child
@@ -1292,6 +1293,10 @@ void start_login(char *host, int autologin, char *name)
addarg(&argv, "-h"); addarg(&argv, "-h");
addarg(&argv, host); addarg(&argv, host);
addarg(&argv, "-p"); addarg(&argv, "-p");
if(name[0])
user = name;
else
user = getenv("USER");
#ifdef AUTHENTICATION #ifdef AUTHENTICATION
if (auth_level < 0 || autologin != AUTH_VALID) { if (auth_level < 0 || autologin != AUTH_VALID) {
if(!no_warn) if(!no_warn)
@@ -1301,24 +1306,18 @@ void start_login(char *host, int autologin, char *name)
addarg(&argv, "-a"); addarg(&argv, "-a");
addarg(&argv, "otp"); addarg(&argv, "otp");
} }
if(log_unauth) { if(log_unauth)
char *u;
if(name[0]) u = name;
else u=getenv("USER");
u = u ? u : "unknown user";
syslog(LOG_INFO, "unauthenticated access from %s (%s)", syslog(LOG_INFO, "unauthenticated access from %s (%s)",
host, u); host, user ? user : "unknown user");
}
} }
if (auth_level >= 0 && autologin == AUTH_VALID) { if (auth_level >= 0 && autologin == AUTH_VALID)
addarg(&argv, "-f"); addarg(&argv, "-f");
addarg(&argv, "--");
addarg(&argv, name);
} /* else */ /* esc@magic.fi; removed stupid else */
#endif #endif
if (getenv("USER")) { if(user){
addarg(&argv, "--"); addarg(&argv, "--");
addarg(&argv, strdup(getenv("USER"))); addarg(&argv, strdup(user));
}
if (getenv("USER")) {
/* /*
* Assume that login will set the USER variable * Assume that login will set the USER variable
* correctly. For SysV systems, this means that * correctly. For SysV systems, this means that
@@ -1330,6 +1329,20 @@ void start_login(char *host, int autologin, char *name)
* USER value will be wrong. * USER value will be wrong.
*/ */
unsetenv("USER"); unsetenv("USER");
{
FILE *f;
char buf[1024];
if((f = fopen("/etc/issue.net", "r")) ||
(f = fopen("/etc/issue", "r"))){
while(fgets(buf, sizeof(buf) - 1, f)){
char *p = buf + strlen(buf) - 1;
if(p[0] == '\n' && (p == buf || p[-1] != '\r'))
strcpy(p, "\r\n");
fputs(buf, stdout);
}
fclose(f);
}
}
} }
closelog(); closelog();
/* /*