8 files changed, 24 insertions, 8 deletions
diff --git a/lib/libc/compat-43/setregid.c b/lib/libc/compat-43/setregid.c
index 49e910e6ebf..66ffe347b1d 100644
--- a/lib/libc/compat-43/setregid.c
+++ b/lib/libc/compat-43/setregid.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setregid.c,v 1.2 1996/08/19 08:19:31 tholo Exp $";
+static char *rcsid = "$OpenBSD: setregid.c,v 1.3 1997/01/19 22:32:14 graichen Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -40,7 +40,9 @@ static char *rcsid = "$OpenBSD: setregid.c,v 1.2 1996/08/19 08:19:31 tholo Exp $
 
 extern int __setregid __P((gid_t, gid_t));
 
+#ifndef NO_WARN_REFERENCES
 __warn_references(setregid, "warning: this program uses setregid(), which is deprecated.");
+#endif
 
 int
 setregid(rgid, egid)
diff --git a/lib/libc/compat-43/setreuid.c b/lib/libc/compat-43/setreuid.c
index 9e55abae806..03785e9e927 100644
--- a/lib/libc/compat-43/setreuid.c
+++ b/lib/libc/compat-43/setreuid.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setreuid.c,v 1.2 1996/08/19 08:19:33 tholo Exp $";
+static char *rcsid = "$OpenBSD: setreuid.c,v 1.3 1997/01/19 22:32:14 graichen Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -40,7 +40,9 @@ static char *rcsid = "$OpenBSD: setreuid.c,v 1.2 1996/08/19 08:19:33 tholo Exp $
 
 extern int __setreuid __P((uid_t, uid_t));
 
+#ifndef NO_WARN_REFERENCES
 __warn_references(setreuid, "warning: this program uses setreuid(), which is deprecated.");
+#endif
 
 int
 setreuid(ruid, euid)
diff --git a/lib/libc/compat-43/setrgid.c b/lib/libc/compat-43/setrgid.c
index b26f65a8e01..57539b0034f 100644
--- a/lib/libc/compat-43/setrgid.c
+++ b/lib/libc/compat-43/setrgid.c
@@ -32,13 +32,15 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setrgid.c,v 1.4 1996/08/19 08:19:34 tholo Exp $";
+static char *rcsid = "$OpenBSD: setrgid.c,v 1.5 1997/01/19 22:32:15 graichen Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <unistd.h>
 
+#ifndef NO_WARN_REFERENCES
 __warn_references(setrgid, "warning: this program uses setrgid(), which is deprecated.");
+#endif
 
 extern int __setregid __P((gid_t, gid_t));
 
diff --git a/lib/libc/compat-43/setruid.c b/lib/libc/compat-43/setruid.c
index 6b35ad42931..6294e7ccc90 100644
--- a/lib/libc/compat-43/setruid.c
+++ b/lib/libc/compat-43/setruid.c
@@ -32,13 +32,15 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setruid.c,v 1.4 1996/08/19 08:19:36 tholo Exp $";
+static char *rcsid = "$OpenBSD: setruid.c,v 1.5 1997/01/19 22:32:15 graichen Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <unistd.h>
 
+#ifndef NO_WARN_REFERENCES
 __warn_references(setruid, "warning: this program uses setruid(), which is deprecated.");
+#endif
 
 extern int __setreuid __P((uid_t, uid_t));
 
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
index 1cc13d4d8f4..6fccb050ef2 100644
--- a/lib/libc/stdio/gets.c
+++ b/lib/libc/stdio/gets.c
@@ -35,13 +35,15 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: gets.c,v 1.3 1996/12/28 02:30:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: gets.c,v 1.4 1997/01/19 22:32:21 graichen Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 
+#ifndef NO_WARN_REFERENCES
 __warn_references(gets,
     "warning: gets() is very unsafe; consider using fgets()");
+#endif
 
 char *
 gets(buf)
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index bc69c6f265f..76dba5bff37 100644
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: mktemp.c,v 1.3 1996/12/28 02:33:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mktemp.c,v 1.4 1997/01/19 22:32:22 graichen Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -63,8 +63,10 @@ _mktemp(path)
 	return(_gettemp(path, (int *)NULL) ? path : (char *)NULL);
 }
 
+#ifndef NO_WARN_REFERENCES
 __warn_references(mktemp,
     "warning: mktemp() possibly used unsafely; consider using mkstemp()");
+#endif
 
 char *
 mktemp(path)
diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
index 1b49112933d..7aa195e3593 100644
--- a/lib/libc/stdio/tempnam.c
+++ b/lib/libc/stdio/tempnam.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tempnam.c,v 1.5 1996/12/28 02:33:14 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tempnam.c,v 1.6 1997/01/19 22:32:22 graichen Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -43,8 +43,10 @@ static char rcsid[] = "$OpenBSD: tempnam.c,v 1.5 1996/12/28 02:33:14 deraadt Exp
 #include <unistd.h>
 #include <paths.h>
 
+#ifndef NO_WARN_REFERENCES
 __warn_references(tempnam,
     "warning: tempnam() possibly used unsafely; consider using mkstemp()");
+#endif
 
 extern char *_mktemp __P((char *));
 
diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c
index 15f68b02d9e..620cdf2fc6f 100644
--- a/lib/libc/stdio/tmpnam.c
+++ b/lib/libc/stdio/tmpnam.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tmpnam.c,v 1.3 1996/12/28 02:33:15 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tmpnam.c,v 1.4 1997/01/19 22:32:23 graichen Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -43,8 +43,10 @@ static char rcsid[] = "$OpenBSD: tmpnam.c,v 1.3 1996/12/28 02:33:15 deraadt Exp
 #include <stdio.h>
 #include <unistd.h>
 
+#ifndef NO_WARN_REFERENCES
 __warn_references(tmpnam,
     "warning: tmpnam() possibly used unsafely; consider using mkstemp()");
+#endif
 
 extern char *_mktemp __P((char *));