Improve the checks for where to find ndbm (dbm_open etc); should now

[mmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index bbf1850..0e77916 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -55,7 +55,7 @@ extern int  initgroups(char*, int);
 #ifdef HAVE_GDBM_NDBM_H
 #include <gdbm/ndbm.h>
 #else
-#if defined(HAVE_DB_H) && defined(HAVE_LIBDB)
+#if defined(HAVE_DB_H)
 #define DB_DBM_HSEARCH 1
 #include <db.h>
 #else
@@ -965,9 +965,13 @@ logged_in (void)
     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();