===================================================================
RCS file: /src/master/sendmail/src/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- 1.1	1995/05/18 22:36:21
+++ Makefile	1995/05/18 22:40:04
@@ -12,7 +12,8 @@
 # spiral snail, but it will work.
 DBMDEF=	-DNEWDB -DNDBM
 
-CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO
+CC=gcc
+CFLAGS+=-I${.CURDIR} ${DBMDEF} -DBRIMSTONE #-DNETISO
 
 SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
 	deliver.c domain.c envelope.c err.c headers.c macro.c main.c map.c \
@@ -20,7 +21,7 @@
 	stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
 	util.c version.c
 DPADD=	
-LDADD=	
+LDADD=	-static -lresolv -l44bsd -ldb
 MAN1=	mailq.0 newaliases.0
 MAN5=	aliases.0
 MAN8=	sendmail.0 
===================================================================
RCS file: /src/master/sendmail/src/conf.c,v
retrieving revision 1.1
diff -u -r1.1 conf.c
--- 1.1	1995/05/18 22:36:29
+++ conf.c	1995/05/18 22:36:30
@@ -917,7 +917,7 @@
 
 /* Non Apollo stuff removed by Don Lewis 11/15/93 */
 #ifndef lint
-static char  rcsid[] = "@(#)$Id: conf.c,v 1.1 1995/05/18 22:36:29 seth Exp $";
+static char  rcsid[] = "@(#)$Id: conf.c,v 1.1.1.1 1995/05/18 22:36:30 seth Exp $";
 #endif /* !lint */
 
 #ifdef apollo
===================================================================
RCS file: /src/master/sendmail/src/main.c,v
retrieving revision 1.1
diff -u -r1.1 main.c
--- 1.1	1995/05/18 22:36:32
+++ main.c	1995/05/18 22:40:06
@@ -318,7 +318,11 @@
 		(void) setsignal(SIGHUP, intsig);
 	(void) setsignal(SIGTERM, intsig);
 	(void) setsignal(SIGPIPE, SIG_IGN);
+#ifdef BRIMSTONE
+	OldUmask = umask(0);
+#else /*BRIMSTONE*/
 	OldUmask = umask(022);
+#endif /*BRIMSTONE*/
 	OpMode = MD_DELIVER;
 	FullName = getenv("NAME");
 
@@ -517,7 +521,17 @@
 			break;
 
 		  case 'o':	/* set option */
+#ifdef BRIMSTONE
+			/*
+			 * Brimstone uses command line options, as
+			 * non-root, to set various fields in the
+			 * Received line and it looks bad if safe
+			 * is off and it uses cleanstrcopy
+			 */
+			setoption(*optarg, optarg + 1, TRUE, TRUE, CurEnv);
+#else /*BRIMSTONE*/
 			setoption(*optarg, optarg + 1, FALSE, TRUE, CurEnv);
+#endif /*BRIMSTONE*/
 			break;
 
 		  case 'p':	/* set protocol */