X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fslocal.c;h=4a8875e7c2cbbe8054f97c82eb6fb284ea200139;hp=08a3e28b7d8c4d5e2b1cfe80f464766b98e54c45;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=13f84dd50ca5754391dbd3296a5c7425f9363600

diff --git a/uip/slocal.c b/uip/slocal.c
index 08a3e28..4a8875e 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -412,7 +412,8 @@ main (int argc, char **argv)
     /* deliver the message */
     status = localmail (fd, mdlvr);
 
-    return done (status != -1 ? RCV_MOK : RCV_MBX);
+    done (status != -1 ? RCV_MOK : RCV_MBX);
+    return 1;
 }
 
 
@@ -958,7 +959,7 @@ logged_in (void)
 
     while ((utp = getutent()) != NULL) {
         if (
-#ifdef HAVE_UTMP_UT_TYPE
+#ifdef HAVE_STRUCT_UTMP_UT_TYPE
 		utp->ut_type == USER_PROCESS
                 &&
 #endif
@@ -1360,11 +1361,11 @@ you_lose:
 		    /* return path for UUCP style addressing */
 		    ep = strchr(++hp, '\n');
 		    snprintf (buffer, sizeof(buffer), "Return-Path: %.*s!%.*s\n",
-			ep - hp, hp, cp - fp, fp);
+			(int)(ep - hp), hp, (int)(cp - fp), fp);
 		} else {
 		    /* return path for standard domain addressing */
 		    snprintf (buffer, sizeof(buffer), "Return-Path: %.*s\n",
-			cp - fp, fp);
+			(int)(cp - fp), fp);
 		}
 
 		/* Add Return-Path header to message */