X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fslocal.c;h=275eedd48d8bb7bbb1830a4b60906e15288bfdf6;hp=6bf3e15971b11edfdf444e9ef0986a0a4397d4c4;hb=389877bae1fe1a9f7259b8979f6a930744d90fab;hpb=571c5da9d8529e029fb478ee1f47057e0ebb6762

diff --git a/uip/slocal.c b/uip/slocal.c
index 6bf3e15..275eedd 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -16,9 +16,6 @@
  *
  *  to their $HOME/.forward file.
  *
- *  Under MMDF-I, users should (symbolically) link
- *  /usr/local/nmh/lib/slocal to $HOME/bin/rcvmail.
- *
  */
 
 /* Changed to use getutent() and friends.  Assumes that when getutent() exists,
@@ -32,6 +29,7 @@
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>
+#include <h/utils.h>
 
 #include <pwd.h>
 #include <signal.h>
@@ -48,15 +46,14 @@
 extern int  initgroups(char*, int);
 #endif
 
-
-#ifdef HAVE_DB1_NDBM_H
-#include <db1/ndbm.h>
-#else
-#ifdef HAVE_GDBM_NDBM_H
-#include <gdbm/ndbm.h>
-#else
-#include <ndbm.h>
-#endif
+/* This define is needed for Berkeley db v2 and above to
+ * make the header file expose the 'historical' ndbm APIs.
+ * We define it unconditionally because this is simple and
+ * harmless.
+ */
+#define DB_DBM_HSEARCH 1
+#ifdef NDBM_HEADER
+#include NDBM_HEADER
 #endif
 
 #include <utmp.h>
@@ -960,9 +957,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();
@@ -1187,10 +1188,6 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
 		status = pidwait (child_id, 0);
 		alarm (0);
 
-#ifdef MMDFI
-		if (status == RP_MOK || status == RP_OK)
-		    status = 0;
-#endif
 		if (verbose) {
 		    if (status == 0)
 			verbose_printf (", success.\n");