fix for certain SYSV variants which lack utmp.ut_host

diff --git a/citadel/acconfig.h b/citadel/acconfig.h
index 47245d8dbd75f1929ee510781ac7a001f8575d42..6b52e2f41a4c504350871c5168375e48c8039eec 100644 (file)
--- a/citadel/acconfig.h
+++ b/citadel/acconfig.h
@@ -10,6 +10,9 @@
 /* define this if struct utmp has an ut_type member */
 #undef HAVE_UT_TYPE
 
+/* define this if struct utmp has an ut_host member */
+#undef HAVE_UT_HOST
+
 /* define this if the OS has broken non-reentrant gethostby{name,addr}() */
 #undef HAVE_NONREENTRANT_NETDB
 

diff --git a/citadel/configure.in b/citadel/configure.in
index 0d12ea3e15453401f62de908e6e3c2bf3e3f9498..d0f869e563fa151626ec59e5126ccbda25f37a96 100644 (file)
--- a/citadel/configure.in
+++ b/citadel/configure.in
@@ -174,6 +174,13 @@ if test $ac_cv_struct_ut_type = yes; then
        AC_DEFINE(HAVE_UT_TYPE)
 fi
 
+AC_CACHE_CHECK([for ut_host in struct utmp], ac_cv_struct_ut_host,
+[AC_TRY_COMPILE([#include <utmp.h>], [struct utmp ut; ut.ut_host;],
+ac_cv_struct_ut_host=yes, ac_cv_struct_ut_host=no)])
+if test $ac_cv_struct_ut_host = yes; then
+       AC_DEFINE(HAVE_UT_HOST)
+fi
+
 dnl Checks for library functions.
 AC_FUNC_GETPGRP
 AC_PROG_GCC_TRADITIONAL

diff --git a/citadel/routines.c b/citadel/routines.c
index 5bee93e9c557d2bfab32e3a837c0ac1d2d92da42..2b0920d681d2dacab39bfb359ac1bf2fcc8525d8 100644 (file)
--- a/citadel/routines.c
+++ b/citadel/routines.c
@@ -454,9 +454,11 @@ void locate_host(char *hbuf)
 #ifdef HAVE_UT_TYPE
        if (put->ut_type == USER_PROCESS) {
 #endif
+#ifdef HAVE_UT_HOST
                if (*put->ut_host)
                        safestrncpy(hbuf, put->ut_host, 24);
                else
+#endif
                        safestrncpy(hbuf, put->ut_line, 24);
 #ifdef HAVE_UT_TYPE
                }