[master] Remove unneeded rcsid and sccsid tags

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.

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>

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>

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>

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>

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 *);

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>

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>

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

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>

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>
 

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>
 

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>

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.
  */

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

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"