- (djm) utmp direct write & SunOS 4 patch from Charles Levert

   <charles@comm.polymtl.ca>

diff --git a/CREDITS b/CREDITS
index 2c7dab97ecb8d58fcc0241321146e4518dcce56c..59ffd5531636ced454a55694ee685a607f64dfb6 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -12,6 +12,7 @@ Arkadiusz Miskiewicz <misiek@pld.org.pl> - IPv6 compat fixes
 Ben Lindstrom <mouring@pconline.com> - NeXT support
 Ben Taylor <bent@clark.net> - Solaris debugging and fixes
 Bratislav ILICH <bilic@zepter.ru> - Configure fix
+Charles Levert <charles@comm.polymtl.ca> - SunOS 4 & bug fixes
 Chip Salzenberg <chip@valinux.com> - Assorted patches
 Chris Adams <cmadams@hiwaay.net> - OSF SIA support
 Chris Saia <csaia@wtower.com> - SuSE packaging

diff --git a/ChangeLog b/ChangeLog
index 76de985e6e46007fc61bf4dae2a58b69bb771a36..d37de96fcc1968cc6ced5369aca60ed5747df4ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20000809
  - (djm) Define AIX hard limits if headers don't. Report from 
    Bill Painter <william.t.painter@lmco.com>
+ - (djm) utmp direct write & SunOS 4 patch from Charles Levert 
+   <charles@comm.polymtl.ca>
 
 20000808
  - (djm) Cleanup Redhat RPMs. Generate keys at runtime rather than install

diff --git a/configure.in b/configure.in
index 92659857c647c91286d09c32ba2db294581e5ce9..c74f65b91d625d6be6d0aac212f8d00e0e07e5a3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -137,6 +137,11 @@ case "$host" in
 *-*-sunos4*)
        CFLAGS="$CFLAGS -DSUNOS4"
        AC_CHECK_FUNCS(getpwanam)
+       conf_utmp_location=/etc/utmp
+       conf_wtmp_location=/var/adm/wtmp
+       conf_lastlog_location=/var/adm/lastlog
+       MANTYPE='$(CATMAN)'
+       mansubdir=cat
        ;;
 *-sni-sysv*)
        CFLAGS="$CFLAGS -I/usr/local/include"

diff --git a/defines.h b/defines.h
index 23e00d1a779c49af894d70635e72ff1a199a9a6e..0480006d19cce9d6f7797ca8899b2de5a900b9de 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -329,18 +329,33 @@ typedef int mode_t;
 #endif
 
 /* FIXME: put default paths back in */
-#if !defined(UTMP_FILE) && defined(_PATH_UTMP)
-#  define UTMP_FILE _PATH_UTMP
+#ifndef UTMP_FILE
+#  ifdef _PATH_UTMP
+#    define UTMP_FILE _PATH_UTMP
+#  else
+#    ifdef CONF_UTMP_FILE
+#      define UTMP_FILE CONF_UTMP_FILE
+#    endif
+#  endif
 #endif
-#if !defined(WTMP_FILE) && defined(_PATH_WTMP)
-#  define WTMP_FILE _PATH_WTMP
+#ifndef WTMP_FILE
+#  ifdef _PATH_WTMP
+#    define WTMP_FILE _PATH_WTMP
+#  else
+#    ifdef CONF_WTMP_FILE
+#      define WTMP_FILE CONF_WTMP_FILE
+#    endif
+#  endif
 #endif
 /* pick up the user's location for lastlog if given */
-#if !defined(LASTLOG_FILE) && defined(_PATH_LASTLOG)
-#  define LASTLOG_FILE _PATH_LASTLOG
-#endif
-#if !defined(LASTLOG_FILE) && defined(CONF_LASTLOG_FILE)
-#  define LASTLOG_FILE CONF_LASTLOG_FILE
+#ifndef LASTLOG_FILE
+#  ifdef _PATH_LASTLOG
+#    define LASTLOG_FILE _PATH_LASTLOG
+#  else
+#    ifdef CONF_LASTLOG_FILE
+#      define LASTLOG_FILE CONF_LASTLOG_FILE
+#    endif
+#  endif
 #endif
 
 

diff --git a/loginrec.c b/loginrec.c
index 6e9c4ce46ce46d34473dc5400a89ba56f13ebe6c..7e7d7dd0c0f1cb831f8ee59344030b9a482cef3c 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -740,7 +740,7 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut)
                }
                
                (void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET);
-               if (atomicio(write, fd, ut, sizeof(ut)) != sizeof(ut))
+               if (atomicio(write, fd, ut, sizeof(*ut)) != sizeof(*ut))
                        log("utmp_write_direct: error writing %s: %s",
                            UTMP_FILE, strerror(errno));