Simon Burge: fix to handle getutent() on NetBSD

diff --git a/ChangeLog b/ChangeLog
index c50664ad54c5f8d0a1fe3f14bfed6598163ecbfa..e4a660e38f309fb9ed21e9ce28a27884b809554c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-11-08  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
 2005-11-08  Oliver Kiddle  <okiddle@yahoo.co.uk>
 

+       * Simon Burge: acconfig.h, configure.in, uip/rcvtty.c, uip/slocal.c:
+       fix to handle getutent() on NetBSD
+

        * INSTALL, README, docs/README.about, man/nmh.man: update most
        references to the web page and mailing list locations
 
        * INSTALL, README, docs/README.about, man/nmh.man: update most
        references to the web page and mailing list locations
 

diff --git a/acconfig.h b/acconfig.h
index 10866bf247a5c5935c69339bcad587402eb6dee1..cedaa5568574a4c1b24403cda2d789df8d30bc90 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -260,6 +260,9 @@
 /* Define to 1 if struct tm has gmtoff */
 #undef HAVE_TM_GMTOFF
 
 /* Define to 1 if struct tm has gmtoff */
 #undef HAVE_TM_GMTOFF
 

+/* Define to 1 if struct utmp has ut_type */
+#undef HAVE_UTMP_UT_TYPE
+

 /* Define if your system has sigsetjmp */
 #undef HAVE_SIGSETJMP
 
 /* Define if your system has sigsetjmp */
 #undef HAVE_SIGSETJMP
 

diff --git a/configure.in b/configure.in
index 9b8c56806556c0b8625dcabc83763a8552f15018..287875bc95dc6948ff218ba5e32ddb4c2b575bc1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -793,6 +793,15 @@ if test $nmh_cv_struct_tm_gmtoff = yes; then
   AC_DEFINE(HAVE_TM_GMTOFF)
 fi
 
   AC_DEFINE(HAVE_TM_GMTOFF)
 fi
 

+AC_CACHE_CHECK(for ut_type in struct utmp, nmh_cv_struct_utmp_ut_type,
+[AC_TRY_COMPILE(
+[#include <utmp.h>],
+[struct utmp temputmp; temputmp.ut_type = 0;],
+  nmh_cv_struct_utmp_ut_type=yes, nmh_cv_struct_utmp_ut_type=no)])
+if test $nmh_cv_struct_utmp_ut_type = yes; then
+  AC_DEFINE(HAVE_UTMP_UT_TYPE)
+fi
+

 dnl -------------
 dnl CHECK SIGNALS
 dnl -------------
 dnl -------------
 dnl CHECK SIGNALS
 dnl -------------

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 12b73e7c5cb940e7d4d612cd7d3a4995a27b1bea..9b272d29690f258876ec28ee2564b164af30f7ce 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -176,10 +176,14 @@ main (int argc, char **argv)
 #ifdef HAVE_GETUTENT
     setutent();
     while ((utp = getutent()) != NULL) {
 #ifdef HAVE_GETUTENT
     setutent();
     while ((utp = getutent()) != NULL) {

-        if (utp->ut_type == USER_PROCESS 
-               && utp->ut_user[0] != 0
+        if (
+#ifdef HAVE_UTMP_UT_TYPE
+              utp->ut_type == USER_PROCESS 
+              &&
+#endif
+               utp->ut_name[0] != 0

                && utp->ut_line[0] != 0
                && utp->ut_line[0] != 0

-               && strncmp (user, utp->ut_user, sizeof(utp->ut_user)) == 0) {
+               && strncmp (user, utp->ut_name, sizeof(utp->ut_name)) == 0) {

             strncpy (tty, utp->ut_line, sizeof(utp->ut_line));
            alert (tty, md);
         }
             strncpy (tty, utp->ut_line, sizeof(utp->ut_line));
            alert (tty, md);
         }

diff --git a/uip/slocal.c b/uip/slocal.c
index bbf1850615034813236eae29014838b0ab8d60cc..ca23fd89457900685cc25449f7f4d8a1e73c6f25 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -965,9 +965,13 @@ logged_in (void)
     setutent();
 
     while ((utp = getutent()) != NULL) {
     setutent();
 
     while ((utp = getutent()) != NULL) {

-        if (utp->ut_type == USER_PROCESS
-                && utp->ut_user[0] != 0
-                && strncmp (user, utp->ut_user, sizeof(utp->ut_user)) == 0) {
+        if (
+#ifdef HAVE_UTMP_UT_TYPE
+               utp->ut_type == USER_PROCESS
+                &&
+#endif
+               utp->ut_name[0] != 0
+                && strncmp (user, utp->ut_name, sizeof(utp->ut_name)) == 0) {

             if (debug)
                 continue;
             endutent();
             if (debug)
                 continue;
             endutent();