summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS1
-rw-r--r--ChangeLog2
-rw-r--r--configure.in5
-rw-r--r--defines.h33
-rw-r--r--loginrec.c4
5 files changed, 34 insertions, 11 deletions
diff --git a/CREDITS b/CREDITS
index 2c7dab97e..59ffd5531 100644
--- a/CREDITS
+++ b/CREDITS
@@ -12,6 +12,7 @@ Arkadiusz Miskiewicz <misiek@pld.org.pl> - IPv6 compat fixes
12Ben Lindstrom <mouring@pconline.com> - NeXT support 12Ben Lindstrom <mouring@pconline.com> - NeXT support
13Ben Taylor <bent@clark.net> - Solaris debugging and fixes 13Ben Taylor <bent@clark.net> - Solaris debugging and fixes
14Bratislav ILICH <bilic@zepter.ru> - Configure fix 14Bratislav ILICH <bilic@zepter.ru> - Configure fix
15Charles Levert <charles@comm.polymtl.ca> - SunOS 4 & bug fixes
15Chip Salzenberg <chip@valinux.com> - Assorted patches 16Chip Salzenberg <chip@valinux.com> - Assorted patches
16Chris Adams <cmadams@hiwaay.net> - OSF SIA support 17Chris Adams <cmadams@hiwaay.net> - OSF SIA support
17Chris Saia <csaia@wtower.com> - SuSE packaging 18Chris Saia <csaia@wtower.com> - SuSE packaging
diff --git a/ChangeLog b/ChangeLog
index 76de985e6..d37de96fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120000809 120000809
2 - (djm) Define AIX hard limits if headers don't. Report from 2 - (djm) Define AIX hard limits if headers don't. Report from
3 Bill Painter <william.t.painter@lmco.com> 3 Bill Painter <william.t.painter@lmco.com>
4 - (djm) utmp direct write & SunOS 4 patch from Charles Levert
5 <charles@comm.polymtl.ca>
4 6
520000808 720000808
6 - (djm) Cleanup Redhat RPMs. Generate keys at runtime rather than install 8 - (djm) Cleanup Redhat RPMs. Generate keys at runtime rather than install
diff --git a/configure.in b/configure.in
index 92659857c..c74f65b91 100644
--- a/configure.in
+++ b/configure.in
@@ -137,6 +137,11 @@ case "$host" in
137*-*-sunos4*) 137*-*-sunos4*)
138 CFLAGS="$CFLAGS -DSUNOS4" 138 CFLAGS="$CFLAGS -DSUNOS4"
139 AC_CHECK_FUNCS(getpwanam) 139 AC_CHECK_FUNCS(getpwanam)
140 conf_utmp_location=/etc/utmp
141 conf_wtmp_location=/var/adm/wtmp
142 conf_lastlog_location=/var/adm/lastlog
143 MANTYPE='$(CATMAN)'
144 mansubdir=cat
140 ;; 145 ;;
141*-sni-sysv*) 146*-sni-sysv*)
142 CFLAGS="$CFLAGS -I/usr/local/include" 147 CFLAGS="$CFLAGS -I/usr/local/include"
diff --git a/defines.h b/defines.h
index 23e00d1a7..0480006d1 100644
--- a/defines.h
+++ b/defines.h
@@ -329,18 +329,33 @@ typedef int mode_t;
329#endif 329#endif
330 330
331/* FIXME: put default paths back in */ 331/* FIXME: put default paths back in */
332#if !defined(UTMP_FILE) && defined(_PATH_UTMP) 332#ifndef UTMP_FILE
333# define UTMP_FILE _PATH_UTMP 333# ifdef _PATH_UTMP
334# define UTMP_FILE _PATH_UTMP
335# else
336# ifdef CONF_UTMP_FILE
337# define UTMP_FILE CONF_UTMP_FILE
338# endif
339# endif
334#endif 340#endif
335#if !defined(WTMP_FILE) && defined(_PATH_WTMP) 341#ifndef WTMP_FILE
336# define WTMP_FILE _PATH_WTMP 342# ifdef _PATH_WTMP
343# define WTMP_FILE _PATH_WTMP
344# else
345# ifdef CONF_WTMP_FILE
346# define WTMP_FILE CONF_WTMP_FILE
347# endif
348# endif
337#endif 349#endif
338/* pick up the user's location for lastlog if given */ 350/* pick up the user's location for lastlog if given */
339#if !defined(LASTLOG_FILE) && defined(_PATH_LASTLOG) 351#ifndef LASTLOG_FILE
340# define LASTLOG_FILE _PATH_LASTLOG 352# ifdef _PATH_LASTLOG
341#endif 353# define LASTLOG_FILE _PATH_LASTLOG
342#if !defined(LASTLOG_FILE) && defined(CONF_LASTLOG_FILE) 354# else
343# define LASTLOG_FILE CONF_LASTLOG_FILE 355# ifdef CONF_LASTLOG_FILE
356# define LASTLOG_FILE CONF_LASTLOG_FILE
357# endif
358# endif
344#endif 359#endif
345 360
346 361
diff --git a/loginrec.c b/loginrec.c
index 8b82fa29d..e7542c92a 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -160,7 +160,7 @@
160#include "xmalloc.h" 160#include "xmalloc.h"
161#include "loginrec.h" 161#include "loginrec.h"
162 162
163RCSID("$Id: loginrec.c,v 1.17 2000/07/11 02:15:54 djm Exp $"); 163RCSID("$Id: loginrec.c,v 1.18 2000/08/09 06:34:28 djm Exp $");
164 164
165/** 165/**
166 ** prototypes for helper functions in this file 166 ** prototypes for helper functions in this file
@@ -740,7 +740,7 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut)
740 } 740 }
741 741
742 (void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET); 742 (void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET);
743 if (atomicio(write, fd, ut, sizeof(ut)) != sizeof(ut)) 743 if (atomicio(write, fd, ut, sizeof(*ut)) != sizeof(*ut))
744 log("utmp_write_direct: error writing %s: %s", 744 log("utmp_write_direct: error writing %s: %s",
745 UTMP_FILE, strerror(errno)); 745 UTMP_FILE, strerror(errno));
746 746