From: Shawn Routhier <sar@isc.org>
Date: Wed, 16 Jul 2014 18:06:11 +0000 (-0700)
Subject: [master] Remove unneeded rcsid and sccsid tags
X-Git-Tag: v4_3_1rc1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29c6b4f102473b165fde93c0eb85215efb035f25;p=thirdparty%2Fdhcp.git

[master] Remove unneeded rcsid and sccsid tags
---

diff --git a/RELNOTES b/RELNOTES
index 7eeba46ee..0285db468 100644
--- 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 5b6ae7680..bbefe5ef8 100644
--- 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 f43933840..dad5087f9 100644
--- 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 3f6e4ea64..a1bb3d52b 100644
--- 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 0203997f6..9b0b1cabd 100644
--- 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 25f4f8910..1a0cda628 100644
--- 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 793f8e815..811271310 100644
--- 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 5c4c73d5c..64f179d52 100644
--- 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 3735477f0..c1c962e9a 100644
--- 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 2163039c8..afaf1c893 100644
--- 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 1a58d1a9b..ce667588b 100644
--- 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 ab2c3c9a3..5a00115b8 100644
--- 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 124d1dde9..649d813c4 100644
--- 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 a26e0ef56..f785e07d9 100644
--- 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 8311d04f2..ff814137f 100644
--- 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 c7d7ffe97..611d9ee6a 100644
--- 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"