openbsd-ports/x11/eterm/patches/patch-src_utmp.c
brad 1aabea36aa - fix utmp handling
- tmpnam() -> mkstemp()
--
From: Cameron Lerch <opcode@skylab.2y.net>
2000-08-12 08:31:48 +00:00

79 lines
2.2 KiB
C

--- src/utmp.c.orig Wed Sep 29 09:16:31 1999
+++ src/utmp.c Fri Aug 11 11:38:27 2000
@@ -68,7 +68,7 @@
#ifdef HAVE_LASTLOG_H
# include <lastlog.h>
#endif
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
# include <ttyent.h>
#endif
@@ -273,7 +273,7 @@
#else /* USE_SYSV_UTMP */
/* BSD utmp support */
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
/* used to hold the line we are using */
static char ut_line[32];
@@ -321,7 +321,7 @@
}
}
-#else /* __FreeBSD__ || NetBSD || BSDI */
+#else /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */
static int utmp_pos = 0; /* position of utmp-stamp */
/*----------------------------------------------------------------------*
@@ -379,7 +379,7 @@
return rval;
}
-#endif /* __FreeBSD__ || NetBSD || BSDI */
+#endif
/*
* make a utmp entry
@@ -402,7 +402,7 @@
return;
}
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
strncpy(ut_line, pty, 31);
strncpy(utmp.ut_line, pty, UT_LINESIZE);
@@ -411,7 +411,7 @@
utmp.ut_time = time(NULL);
b_login(&utmp);
-#else /* __FreeBSD__ || NetBSD || BSDI */
+#else /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */
strncpy(utmp.ut_line, ut_id, sizeof(utmp.ut_line));
strncpy(utmp.ut_name, pwent->pw_name, sizeof(utmp.ut_name));
strncpy(utmp.ut_host, hostname, sizeof(utmp.ut_host));
@@ -428,10 +428,10 @@
void
cleanutent(void)
{
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
logout(ut_line);
logwtmp(ut_line, "", "");
-#else /* __FreeBSD__ */
+#else /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */
FILE *fd;
privileges(INVOKE);
@@ -445,7 +445,7 @@
fclose(fd);
}
privileges(REVERT);
-#endif /* __FreeBSD__ || NetBSD || BSDI */
+#endif
}
#endif /* USE_SYSV_UTMP */