ultrix has wierd getutent, so check if utmp.ut_pid exists, and conditionalize

on that too...

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4051 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 92c437e1c6df630c9c65b6ea51c25c8219dd7568..3e0894338398d24b29b2a4b1b7520dacd3bede34 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,4 +1,8 @@
-Wed Jul 27 12:52:04 1994  Mark Eichin  (eichin@tweedledumber.cygnus.com)
+Fri Aug  5 15:35:54 1994  Mark Eichin  (eichin@cygnus.com)
+
+       * configure.in, logutil.c: check for NO_UT_PID, use it.
+
+Wed Jul 27 12:52:04 1994  Mark Eichin  (eichin@cygnus.com)
 
        * krlogind.c, krlogin.c, krcp.c: define roundup if needed.
 

diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index 1dc3cdf2cdf1fbe96b461c15c7121ffd0eccc40d..ae55528f07fff76e14104f4aecfc694e9579a6e1 100644 (file)
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -37,6 +37,11 @@ AC_COMPILE_CHECK([ut_exit in struct utmp],
 [struct utmp ut; ut.ut_exit;],
 ,
 AC_DEFINE(NO_UT_EXIT))
+AC_COMPILE_CHECK([ut_pid in struct utmp],
+[#include <utmp.h>],
+[struct utmp ut; ut.ut_pid;],
+,
+AC_DEFINE(NO_UT_PID))
 KRB_INCLUDE
 WITH_KRB5ROOT
 WITH_KRB4

diff --git a/src/appl/bsd/logutil.c b/src/appl/bsd/logutil.c
index 357d00d16ed15cda3f945b310d69de5e47ee1bf2..9cd8c666429f1418a8bf61e3b4c6b6c3f0296168 100644 (file)
--- a/src/appl/bsd/logutil.c
+++ b/src/appl/bsd/logutil.c
@@ -47,7 +47,7 @@ void login(ut)
     struct utmp utmp;
     int tty;
     
-#ifdef HAVE_GETUTENT
+#if defined(HAVE_GETUTENT) && !defined(NO_UT_PID)
     if (!ut->ut_pid)
        ut->ut_pid = getppid();
     ut->ut_type = USER_PROCESS;
@@ -94,7 +94,7 @@ logout(line)
        memset(ut.ut_host,0, sizeof(ut.ut_host));
 #endif
        (void)time(&ut.ut_time);
-#ifdef HAVE_GETUTENT
+#if defined(HAVE_GETUTENT) && !defined(NO_UT_PID)
        memset(ut.ut_id, 0, sizeof(ut.ut_id));
        ut.ut_pid = 0;
 #ifndef NO_UT_EXIT
@@ -144,7 +144,7 @@ logwtmp(line, name, host, keep_open, logingin)
        ut.ut_pid = getpid();
 #endif
        (void)time(&ut.ut_time);
-#ifdef HAVE_GETUTENT
+#if defined(HAVE_GETUTENT) && !defined(NO_UT_PID)
        if (*name) {
            if (!ut.ut_pid)
                ut.ut_pid = getpid();