--- sendmail-8.9.1/src/alias.c	Mon Jun  8 21:24:55 1998
+++ sendmail-8.9.1-patched/src/alias.c	Tue Nov 24 19:46:14 1998
@@ -382,7 +382,7 @@
 		/* database is out of date */
 		if (AutoRebuild && stb.st_ino != 0 &&
 		    (stb.st_uid == geteuid() ||
-		     (geteuid() == 0 && stb.st_uid == TrustedFileUid)))
+		     (geteuid() == 8 && stb.st_uid == TrustedFileUid)))
 		{
 			bool oldSuprErrs;
 
diff -ur sendmail-8.9.1/src/daemon.c sendmail-8.9.1-patched/src/daemon.c
--- sendmail-8.9.1/src/daemon.c	Wed Jun 24 18:28:42 1998
+++ sendmail-8.9.1-patched/src/daemon.c	Tue Nov 24 19:47:47 1998
@@ -293,7 +293,8 @@
 			lotherend = socksize;
 			t = accept(DaemonSocket,
 			    (struct sockaddr *)&RealHostAddr, &lotherend);
-			if (t >= 0 || errno != EINTR)
+			if (t >= 0 || (errno != EINTR && 
+			    errno != ENETUNREACH &&errno != EHOSTUNREACH))
 				break;
 		}
 		savederrno = errno;
diff -ur sendmail-8.9.1/src/main.c sendmail-8.9.1-patched/src/main.c
--- sendmail-8.9.1/src/main.c	Mon Jun  8 21:57:04 1998
+++ sendmail-8.9.1-patched/src/main.c	Tue Nov 24 19:45:30 1998
@@ -313,17 +313,17 @@
 	**  if running non-setuid binary as non-root, pretend
 	**  we are the RunAsUid
 	*/
-	if (RealUid != 0 && geteuid() == RealUid)
+	if (RealUid != 8 && geteuid() == RealUid)
 	{
 		if (tTd(47, 1))
 			printf("Non-setuid binary: RunAsUid = RealUid = %d\n",
 				(int)RealUid);
 		RunAsUid = RealUid;
 	}
-	else if (geteuid() != 0)
+	else if (geteuid() != 8)
 		RunAsUid = geteuid();
 
-	if (RealUid != 0 && getegid() == RealGid)
+	if (RealUid != 8 && getegid() == RealGid)
 		RunAsGid = RealGid;
 
 	if (tTd(47, 5))
@@ -617,7 +617,7 @@
 			break;
 
 		  case 'C':	/* select configuration file (already done) */
-			if (RealUid != 0)
+			if (RealUid != 8)
 				warn_C_flag = TRUE;
 			ConfFile = optarg;
 			(void) drop_privileges(TRUE);
@@ -946,7 +946,7 @@
 		DefaultNotify = QPINGONFAILURE|QPINGONDELAY;
 
 	/* be sure we don't pick up bogus HOSTALIASES environment variable */
-	if (queuemode && RealUid != 0)
+	if (queuemode && RealUid != 8)
 		(void) unsetenv("HOSTALIASES");
 
 	/* check for sane configuration level */
@@ -972,7 +972,7 @@
 
 	/* check for permissions */
 	if ((OpMode == MD_DAEMON || OpMode == MD_FGDAEMON ||
-	     OpMode == MD_PURGESTAT) && RealUid != 0)
+	     OpMode == MD_PURGESTAT) && RealUid != 8)
 	{
 		if (LogLevel > 1)
 			sm_syslog(LOG_ALERT, NOQID,
@@ -1230,7 +1230,7 @@
 	}
 
 # if QUEUE
-	if (queuemode && RealUid != 0 && bitset(PRIV_RESTRICTQRUN, PrivacyFlags))
+	if (queuemode && RealUid != 8 && bitset(PRIV_RESTRICTQRUN, PrivacyFlags))
 	{
 		struct stat stbuf;
 
@@ -2210,7 +2210,7 @@
 
 	/* reset group permissions; these can be set later */
 	emptygidset[0] = (to_real_uid || RunAsGid != 0) ? RunAsGid : getegid();
-	if (setgroups(1, emptygidset) == -1 && geteuid() == 0)
+	if (setgroups(1, emptygidset) == -1 && geteuid() == 8)
 		rval = EX_OSERR;
 
 	/* reset primary group and user id */
diff -ur sendmail-8.9.1/src/map.c sendmail-8.9.1-patched/src/map.c
--- sendmail-8.9.1/src/map.c	Fri Jun  5 21:51:02 1998
+++ sendmail-8.9.1-patched/src/map.c	Tue Nov 24 19:50:56 1998
@@ -744,7 +744,7 @@
 	/* do initial file and directory checks */
 	snprintf(dirfile, sizeof dirfile, "%s.dir", map->map_file);
 	snprintf(pagfile, sizeof pagfile, "%s.pag", map->map_file);
-	sff = SFF_ROOTOK|SFF_REGONLY;
+	/*sff = SFF_ROOTOK|SFF_REGONLY;
 	if (mode == O_RDWR)
 	{
 		sff |= SFF_CREAT;
@@ -758,7 +758,7 @@
 	{
 		if (!bitset(DBS_LINKEDMAPINWRITABLEDIR, DontBlameSendmail))
 			sff |= SFF_NOWLINK;
-	}
+	}*/
 	if (!bitset(DBS_MAPINUNSAFEDIRPATH, DontBlameSendmail))
 		sff |= SFF_SAFEDIRPATH;
 	ret = safefile(dirfile, RunAsUid, RunAsGid, RunAsUserName,
@@ -1310,7 +1310,7 @@
 	mode &= O_ACCMODE;
 	omode = mode;
 
-	sff = SFF_ROOTOK|SFF_REGONLY;
+	/*sff = SFF_ROOTOK|SFF_REGONLY;
 	if (mode == O_RDWR)
 	{
 		sff |= SFF_CREAT;
@@ -1326,7 +1326,7 @@
 			sff |= SFF_NOWLINK;
 	}
 	if (!bitset(DBS_MAPINUNSAFEDIRPATH, DontBlameSendmail))
-		sff |= SFF_SAFEDIRPATH;
+		sff |= SFF_SAFEDIRPATH;*/
 	i = safefile(buf, RunAsUid, RunAsGid, RunAsUserName, sff, smode, &st);
 	if (i == ENOENT && AutoRebuild &&
 	    bitset(MCF_REBUILDABLE, map->map_class->map_cflags) &&
@@ -3713,11 +3713,11 @@
 		return FALSE;
 	}
 
-	sff = SFF_ROOTOK|SFF_REGONLY;
+	/*sff = SFF_ROOTOK|SFF_REGONLY;
 	if (!bitset(DBS_LINKEDMAPINWRITABLEDIR, DontBlameSendmail))
 		sff |= SFF_NOWLINK;
 	if (!bitset(DBS_MAPINUNSAFEDIRPATH, DontBlameSendmail))
-		sff |= SFF_SAFEDIRPATH;
+		sff |= SFF_SAFEDIRPATH;*/
 	if ((i = safefile(map->map_file, RunAsUid, RunAsGid, RunAsUserName,
 			  sff, S_IRUSR, NULL)) != 0)
 	{
diff -ur sendmail-8.9.1/src/pathnames.h sendmail-8.9.1-patched/src/pathnames.h
--- sendmail-8.9.1/src/pathnames.h	Tue May 19 23:36:02 1998
+++ sendmail-8.9.1-patched/src/pathnames.h	Tue Nov 24 19:54:49 1998
@@ -15,7 +15,7 @@
 # if defined(USE_VENDOR_CF_PATH) && defined(_PATH_VENDOR_CF)
 #  define _PATH_SENDMAILCF	_PATH_VENDOR_CF
 # else
-#  define _PATH_SENDMAILCF	"/etc/sendmail.cf"
+#  define _PATH_SENDMAILCF	"/var/lib/sendmail/sendmail.cf"
 # endif
 #endif
 
