3 files changed, 19 insertions, 5 deletions

diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index e67406b58869..4969b34940e2 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.34 1997/12/13 02:37:20 brian Exp $
+#	$Id: Makefile,v 1.35 1998/01/17 14:21:21 brian Exp $
 
 PROG=	ppp
 SRCS=	arp.c async.c auth.c ccp.c chap.c chat.c command.c deflate.c \
@@ -14,6 +14,10 @@ BINMODE=4550
 BINOWN=	root
 BINGRP=	network
 
+.if defined(RELEASE_CRUNCH)
+CFLAGS+=-DRELEASE_CRUNCH
+.endif
+
 .if defined(NOALIAS) || defined(RELEASE_CRUNCH)
 CFLAGS+=-DNOALIAS
 .else
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index f2fba1c3dc2a..6418acabb216 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: main.c,v 1.119 1998/01/21 02:15:20 brian Exp $
+ * $Id: main.c,v 1.120 1998/01/27 23:14:51 brian Exp $
  *
  *	TODO:
  *		o Add commands for traffic summary, version display, etc.
@@ -540,9 +540,12 @@ main(int argc, char **argv)
   if (lockfile != NULL) {
     fprintf(lockfile, "%d\n", (int) getpid());
     fclose(lockfile);
-  } else
+  }
+#ifndef RELEASE_CRUNCH
+  else
     LogPrintf(LogALERT, "Warning: Can't create %s: %s\n",
               pid_filename, strerror(errno));
+#endif
 
   LogPrintf(LogPHASE, "PPP Started.\n");
 
diff --git a/usr.sbin/ppp/modem.c b/usr.sbin/ppp/modem.c
index d19b6fb1345b..2412755aa18c 100644
--- a/usr.sbin/ppp/modem.c
+++ b/usr.sbin/ppp/modem.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: modem.c,v 1.75 1998/01/20 22:47:42 brian Exp $
+ * $Id: modem.c,v 1.76 1998/01/21 02:15:22 brian Exp $
  *
  *  TODO:
  */
@@ -403,8 +403,11 @@ LockModem(void)
   if (lockfile != NULL) {
     fprintf(lockfile, "tun%d\n", tunno);
     fclose(lockfile);
-  } else
+  }
+#ifndef RELEASE_CRUNCH
+  else
     LogPrintf(LogALERT, "Warning: Can't create %s: %s\n", fn, strerror(errno));
+#endif
 
   return 0;
 }
@@ -416,8 +419,12 @@ UnlockModem(void)
     return;
 
   snprintf(fn, sizeof fn, "%s%s.if", _PATH_VARRUN, VarBaseDevice);
+#ifndef RELEASE_CRUNCH
   if (ID0unlink(fn) == -1)
     LogPrintf(LogALERT, "Warning: Can't remove %s: %s\n", fn, strerror(errno));
+#else
+  ID0unlink(fn);
+#endif
 
   if (!(mode & MODE_DIRECT) && ID0uu_unlock(VarBaseDevice) == -1)
     LogPrintf(LogALERT, "Warning: Can't uu_unlock %s\n", fn);