[master] Remove unneeded rcsid and sccsid tags

diff --git a/RELNOTES b/RELNOTES
index 7eeba46ee4ec69df8437e47b9adca1fd0baf3ca5..0285db468b766d5ea43f6e03a6ab4a82c7223e65 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -59,6 +59,11 @@ by Eric Young (eay@cryptsoft.com).
   bug report and patch.
   [ISC-Bugs 36102]
 
+- Remove more unused RCSID tags.  These weren't noticed in 4.3 as
+  the code isn't used anymore but we remove them here to keep the
+  code consistent across versions.
+  [ISC-Bugs #36451]
+
                        Changes since 4.3.0
 
 - Tidy up several small tickets.

diff --git a/minires/ns_date.c b/minires/ns_date.c
index 5b6ae76808b9e7799818d81ab1e5906ec716a389..bbefe5ef840465a5db851da47ca73cf6e574a83b 100644 (file)
--- a/minires/ns_date.c
+++ b/minires/ns_date.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2009,2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -21,10 +22,6 @@
  *   https://www.isc.org/
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: ns_date.c,v 1.8 2009/11/24 02:06:57 sar Exp $";
-#endif
-
 /* Import. */
 
 #include <ctype.h>

diff --git a/minires/ns_name.c b/minires/ns_name.c
index f439338407707f8595e760a6990ce23b508de504..dad5087f94ffd719ce008ad6d59a9a9869996ae3 100644 (file)
--- a/minires/ns_name.c
+++ b/minires/ns_name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -21,10 +21,6 @@
  *   https://www.isc.org/
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: ns_name.c,v 1.5 2009/11/24 02:06:57 sar Exp $";
-#endif
-
 #include <sys/types.h>
 
 #include <netinet/in.h>

diff --git a/minires/ns_parse.c b/minires/ns_parse.c
index 3f6e4ea64c4bbc7f2aac0166e9ad3ea14bae9cbf..a1bb3d52bcd3f29b27e48d8add9ace3a85acef7d 100644 (file)
--- a/minires/ns_parse.c
+++ b/minires/ns_parse.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2004,2009,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2013-2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -21,10 +22,6 @@
  *   https://www.isc.org/
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: ns_parse.c,v 1.5 2009/11/24 02:06:57 sar Exp $";
-#endif
-
 /* Import. */
 
 #include <sys/types.h>

diff --git a/minires/ns_samedomain.c b/minires/ns_samedomain.c
index 0203997f6fda9baff54c9ad29b301673a0a9516c..9b0b1cabdb61a1b8ca7afc06c642faed3001139b 100644 (file)
--- a/minires/ns_samedomain.c
+++ b/minires/ns_samedomain.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -21,10 +21,6 @@
  *   https://www.isc.org/
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: ns_samedomain.c,v 1.6 2009/11/24 02:06:57 sar Exp $";
-#endif
-
 #include <sys/types.h>
 #include <errno.h>
 #include <string.h>

diff --git a/minires/ns_sign.c b/minires/ns_sign.c
index 25f4f8910d1d7aa198bc13b4c8bce3b695d6877e..1a0cda628852d20a1ef91455e4c1157cb8107b38 100644 (file)
--- a/minires/ns_sign.c
+++ b/minires/ns_sign.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2004,2009,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2013-2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -21,10 +22,6 @@
  *   https://www.isc.org/
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: ns_sign.c,v 1.8 2009/11/24 02:06:57 sar Exp $";
-#endif
-
 #if defined (TRACING)
 #define time(x)                trace_mr_time (x)
 time_t trace_mr_time (time_t *);

diff --git a/minires/ns_verify.c b/minires/ns_verify.c
index 793f8e8159637c233b2f8ee0d596627907cf7f12..81127131006911f1eb513cb111763cf974db38f6 100644 (file)
--- a/minires/ns_verify.c
+++ b/minires/ns_verify.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2004,2007,2009,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2013-2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -21,10 +22,6 @@
  *   https://www.isc.org/
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id: ns_verify.c,v 1.11 2009/11/24 02:06:57 sar Exp $";
-#endif
-
 /* Import. */
 
 #include <sys/types.h>

diff --git a/minires/res_comp.c b/minires/res_comp.c
index 5c4c73d5c5620502c1579afc3e624cf9f3f9b5fc..64f179d526c62d31f0e5321a197f4cfb2347157e 100644 (file)
--- a/minires/res_comp.c
+++ b/minires/res_comp.c
@@ -48,7 +48,7 @@
  */
 
 /*
- * Portions Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (c) 2004,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -70,11 +70,6 @@
  *   https://www.isc.org/
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_comp.c   8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_comp.c,v 1.5 2009/11/24 02:06:57 sar Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>

diff --git a/minires/res_findzonecut.c b/minires/res_findzonecut.c
index 3735477f0f93b538d887f7d2bb90af6238c794b5..c1c962e9aa1bab40d9a946680f5b1b3c5d7cebc9 100644 (file)
--- a/minires/res_findzonecut.c
+++ b/minires/res_findzonecut.c
@@ -1,9 +1,6 @@
-#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_findzonecut.c,v 1.18 2009/11/24 02:06:57 sar Exp $";
-#endif /* not lint */
-
 /*
- * Copyright (c) 2004,2009,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2013-2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any

diff --git a/minires/res_init.c b/minires/res_init.c
index 2163039c87782f2f9c665cf854d84baaae84d036..afaf1c89306c42458a9003e6053101c8841fda8e 100644 (file)
--- a/minires/res_init.c
+++ b/minires/res_init.c
@@ -48,7 +48,8 @@
  */
 
 /*
- * Portions Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (c) 2009,2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -70,11 +71,6 @@
  *   https://www.isc.org/
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_init.c   8.1 (Berkeley) 6/7/93";
-static const char rcsid[] = "$Id: res_init.c,v 1.13 2009/11/24 02:06:57 sar Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>

diff --git a/minires/res_mkquery.c b/minires/res_mkquery.c
index 1a58d1a9b75fbf4363579ad33ab6b6cce8583750..ce667588b9405de12b9c3777d78de17f71ce977a 100644 (file)
--- a/minires/res_mkquery.c
+++ b/minires/res_mkquery.c
@@ -48,7 +48,8 @@
  */
 
 /*
- * Portions Copyright (c) 2004,2009,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (c) 2013-2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -70,11 +71,6 @@
  *   https://www.isc.org/
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_mkquery.c        8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_mkquery.c,v 1.8 2009/11/24 02:06:57 sar Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/param.h>
 

diff --git a/minires/res_mkupdate.c b/minires/res_mkupdate.c
index ab2c3c9a352cdb2fee84959fc3237036b54c7c59..5a00115b8f8c4f4ecdeaf4a6e88293ddd0ab6800 100644 (file)
--- a/minires/res_mkupdate.c
+++ b/minires/res_mkupdate.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2004,2007-2009,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2013-2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007-2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -26,10 +27,6 @@
  * <viraj_bais@ccm.fm.intel.com>
  */
 
-#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_mkupdate.c,v 1.16 2009/11/24 02:06:57 sar Exp $";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/param.h>
 

diff --git a/minires/res_query.c b/minires/res_query.c
index 124d1dde9a25fc74eb26e646dba4081f8c59b00e..649d813c47d6188f7f6951a9d04e8d215a5b4b23 100644 (file)
--- a/minires/res_query.c
+++ b/minires/res_query.c
@@ -48,7 +48,8 @@
  */
 
 /*
- * Portions Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (c) 2009,2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -70,11 +71,6 @@
  *   https://www.isc.org/
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_query.c  8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_query.c,v 1.11 2009/11/24 02:06:57 sar Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>

diff --git a/minires/res_send.c b/minires/res_send.c
index a26e0ef56426016c45e1fc6b6b316d11c61ef5db..f785e07d9e3b62b0d0a598a1c109a7095e0d87aa 100644 (file)
--- a/minires/res_send.c
+++ b/minires/res_send.c
@@ -48,7 +48,7 @@
  */
 
 /*
- * Portions Copyright (c) 2004,2008-2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (c) 2004,2008-2009,2014 by Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -70,11 +70,6 @@
  *   https://www.isc.org/
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_send.c   8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.13 2009/11/24 02:06:57 sar Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 /*
  * Send query to name server and wait for reply.
  */

diff --git a/minires/res_update.c b/minires/res_update.c
index 8311d04f26649f017789fbc703693bffb5bbeb78..ff814137fcae28747bf74537dcd6115a3ba7d5e8 100644 (file)
--- a/minires/res_update.c
+++ b/minires/res_update.c
@@ -1,9 +1,6 @@
-#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_update.c,v 1.17 2009/11/24 02:06:57 sar Exp $";
-#endif /* not lint */
-
 /*
- * Copyright (c) 2004,2007,2009,2013 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2013-2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any

diff --git a/omapip/inet_addr.c b/omapip/inet_addr.c
index c7d7ffe9704ad75778071000b491d4223d35d932..611d9ee6ae63b5072abdfc77682761f4a4922941 100644 (file)
--- a/omapip/inet_addr.c
+++ b/omapip/inet_addr.c
@@ -29,14 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)inet_addr.c        8.1 (Berkeley) 6/17/93";
-#else
-static char rcsid[] = "$NetBSD: inet_addr.c,v 1.6 1996/02/02 15:22:23 mrg Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
 #include "dhcpd.h"
 
 #include "omapip/omapip_p.h"