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

Check for `_PATH_WTMP'.

Browse Source 
Remove stupid macros.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1775 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-05-25 15:18:20 +00:00
parent 1f499a90c6
commit 1a3ad193cf
1 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,14 +62,30 @@ int utmp_len = MaxHostNameLen;
#endif #endif
#ifndef UTMP_FILE #ifndef UTMP_FILE
#ifdef _PATH_UTMP
#define UTMP_FILE _PATH_UTMP
#else
#define UTMP_FILE "/etc/utmp" #define UTMP_FILE "/etc/utmp"
#endif #endif
#endif
#if !defined(WTMP_FILE) && defined(_PATH_WTMP)
#define WTMP_FILE _PATH_WTMP
#endif
#ifndef PARENT_DOES_UTMP #ifndef PARENT_DOES_UTMP
#ifdef WTMP_FILE
char wtmpf[] = WTMP_FILE;
#else
char wtmpf[] = "/usr/adm/wtmp"; char wtmpf[] = "/usr/adm/wtmp";
#endif
char utmpf[] = UTMP_FILE; char utmpf[] = UTMP_FILE;
#else /* PARENT_DOES_UTMP */ #else /* PARENT_DOES_UTMP */
#ifdef WTMP_FILE
char wtmpf[] = WTMP_FILE;
#else
char wtmpf[] = "/etc/wtmp"; char wtmpf[] = "/etc/wtmp";
#endif
#endif /* PARENT_DOES_UTMP */ #endif /* PARENT_DOES_UTMP */
#ifdef HAVE_TMPDIR_H #ifdef HAVE_TMPDIR_H
@@ -88,9 +104,6 @@ char wtmpf[] = "/etc/wtmp";
#endif /* STREAMSPTY */ #endif /* STREAMSPTY */
#define SCPYN(a, b) strncpy(a, b, sizeof(a))
#define SCMPN(a, b) strncmp(a, b, sizeof(a))
#ifdef HAVE_SYS_STREAM_H #ifdef HAVE_SYS_STREAM_H
#ifdef HAVE_SYS_UIO_H #ifdef HAVE_SYS_UIO_H
#include <sys/uio.h> #include <sys/uio.h>
@@ -1128,9 +1141,9 @@ startslave(char *host, int autologin, char *autoname)
time(&wtmp.ut_time); time(&wtmp.ut_time);
wtmp.ut_type = LOGIN_PROCESS; wtmp.ut_type = LOGIN_PROCESS;
wtmp.ut_pid = pid; wtmp.ut_pid = pid;
SCPYN(wtmp.ut_user, "LOGIN"); strncpy(wtmp.ut_user, "LOGIN", sizeof(wtmp.ut_user));
SCPYN(wtmp.ut_host, host); strncpy(wtmp.ut_host, host, sizeof(wtmp.ut_host));
SCPYN(wtmp.ut_line, clean_ttyname(line)); strncpy(wtmp.ut_line, clean_ttyname(line), sizeof(wtmp.ut_line));
pututline(&wtmp); pututline(&wtmp);
endutent(); endutent();
@@ -1227,9 +1240,9 @@ void start_login(char *host, int autologin, char *name)
*/ */
memset(&utmpx, 0, sizeof(utmpx)); memset(&utmpx, 0, sizeof(utmpx));
SCPYN(utmpx.ut_user, ".telnet"); strncpy(utmpx.ut_user, ".telnet", sizeof(utmpx.ut_user));
SCPYN(utmpx.ut_line, clean_ttyname(line)); strncpy(utmpx.ut_line, clean_ttyname(line), sizeof(utmpx.ut_line));
utmpx.ut_pid = pid; utmpx.ut_pid = pid;
utmpx.ut_type = LOGIN_PROCESS; utmpx.ut_type = LOGIN_PROCESS;
@@ -1379,10 +1392,10 @@ rmut(void)
int f = open(wtmpf, O_WRONLY|O_APPEND); int f = open(wtmpf, O_WRONLY|O_APPEND);
struct utmp wtmp; struct utmp wtmp;
if (f >= 0) { if (f >= 0) {
SCPYN(wtmp.ut_line, clean_ttyname(line)); strncpy(wtmp.ut_line, clean_ttyname(line), sizeof(wtmp.ut_line));
SCPYN(wtmp.ut_name, ""); strncpy(wtmp.ut_name, "", sizeof(wtmp.ut_name));
#ifdef HAVE_UT_HOST #ifdef HAVE_UT_HOST
SCPYN(wtmp.ut_host, ""); strncpy(wtmp.ut_host, "", sizeof(wtmp.ut_host));
#endif #endif
time(&wtmp.ut_time); time(&wtmp.ut_time);
write(f, &wtmp, sizeof(wtmp)); write(f, &wtmp, sizeof(wtmp));
@@ -1418,13 +1431,15 @@ rmut(void)
nutmp /= sizeof(struct utmp); nutmp /= sizeof(struct utmp);
for (u = utmp ; u < &utmp[nutmp] ; u++) { for (u = utmp ; u < &utmp[nutmp] ; u++) {
if (SCMPN(u->ut_line, clean_ttyname(line)) || if (strncmp(u->ut_line,
clean_ttyname(line),
sizeof(u->ut_line)) ||
u->ut_name[0]==0) u->ut_name[0]==0)
continue; continue;
lseek(f, ((long)u)-((long)utmp), L_SET); lseek(f, ((long)u)-((long)utmp), L_SET);
SCPYN(u->ut_name, ""); strncpy(u->ut_name, "", sizeof(u->ut_name));
#ifdef HAVE_UT_HOST #ifdef HAVE_UT_HOST
SCPYN(u->ut_host, ""); strncpy(u->ut_host, "", sizeof(u->ut_host));
#endif #endif
time(&u->ut_time); time(&u->ut_time);
write(f, u, sizeof(wtmp)); write(f, u, sizeof(wtmp));
@@ -1436,10 +1451,10 @@ rmut(void)
if (found) { if (found) {
f = open(wtmpf, O_WRONLY|O_APPEND); f = open(wtmpf, O_WRONLY|O_APPEND);
if (f >= 0) { if (f >= 0) {
SCPYN(wtmp.ut_line, clean_ttyname(line)); strncpy(wtmp.ut_line, clean_ttyname(line), sizeof(wtmp.ut_line));
SCPYN(wtmp.ut_name, ""); strncpy(wtmp.ut_name, "", sizeof(wtmp.ut_name));
#ifdef HAVE_UT_HOST #ifdef HAVE_UT_HOST
SCPYN(wtmp.ut_host, ""); strncpy(wtmp.ut_host, "", sizeof(wtmp.ut_host));
#endif #endif
time(&wtmp.ut_time); time(&wtmp.ut_time);
write(f, &wtmp, sizeof(wtmp)); write(f, &wtmp, sizeof(wtmp));