From 8794fdbb485ba9cb02a599a63fe7478605baa4a5 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 23 Aug 2005 23:59:55 +0000
Subject: [PATCH] Add __FBSDID to all .c files in dhclient to aid in
 determining file versions when dealing with user problems.

---
 sbin/dhclient/alloc.c    | 3 +++
 sbin/dhclient/bpf.c      | 4 +++-
 sbin/dhclient/clparse.c  | 3 +++
 sbin/dhclient/conflex.c  | 3 +++
 sbin/dhclient/convert.c  | 3 +++
 sbin/dhclient/dhclient.c | 4 +++-
 sbin/dhclient/dispatch.c | 3 +++
 sbin/dhclient/errwarn.c  | 3 +++
 sbin/dhclient/hash.c     | 3 +++
 sbin/dhclient/inet.c     | 3 +++
 sbin/dhclient/options.c  | 3 +++
 sbin/dhclient/packet.c   | 3 +++
 sbin/dhclient/parse.c    | 4 +++-
 sbin/dhclient/privsep.c  | 3 +++
 sbin/dhclient/tables.c   | 4 +++-
 sbin/dhclient/tree.c     | 3 +++
 16 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/sbin/dhclient/alloc.c b/sbin/dhclient/alloc.c
index cabb76d42989..cd60ceca7d83 100644
--- a/sbin/dhclient/alloc.c
+++ b/sbin/dhclient/alloc.c
@@ -40,6 +40,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 
 struct string_list *
diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c
index 60a9d74b673b..785db2195a77 100644
--- a/sbin/dhclient/bpf.c
+++ b/sbin/dhclient/bpf.c
@@ -1,5 +1,4 @@
 /*	$OpenBSD: bpf.c,v 1.13 2004/05/05 14:28:58 deraadt Exp $	*/
-/*	$FreeBSD$	*/
 
 /* BPF socket interface code, originally contributed by Archie Cobbs. */
 
@@ -41,6 +40,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 #include <sys/ioctl.h>
 #include <sys/uio.h>
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c
index 2777902c7767..e43a876e0310 100644
--- a/sbin/dhclient/clparse.c
+++ b/sbin/dhclient/clparse.c
@@ -40,6 +40,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 #include "dhctoken.h"
 
diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c
index ee96bfeb9ca0..39409a96e81b 100644
--- a/sbin/dhclient/conflex.c
+++ b/sbin/dhclient/conflex.c
@@ -40,6 +40,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <ctype.h>
 
 #include "dhcpd.h"
diff --git a/sbin/dhclient/convert.c b/sbin/dhclient/convert.c
index 0626dc4b3a8e..adca0929a07c 100644
--- a/sbin/dhclient/convert.c
+++ b/sbin/dhclient/convert.c
@@ -43,6 +43,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 
 u_int32_t
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 9f2b2690b34a..bcf09a756b40 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,5 +1,4 @@
 /*	$OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $	*/
-/*	$FreeBSD$	*/
 
 /*
  * Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -54,6 +53,9 @@
  * purpose.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 #include "privsep.h"
 
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index a0d7e90e865a..2fec9136986d 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -39,6 +39,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 
 #include <sys/ioctl.h>
diff --git a/sbin/dhclient/errwarn.c b/sbin/dhclient/errwarn.c
index 03b75478457c..de3458322fda 100644
--- a/sbin/dhclient/errwarn.c
+++ b/sbin/dhclient/errwarn.c
@@ -40,6 +40,9 @@
  * with Vixie Laboratories.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <errno.h>
 
 #include "dhcpd.h"
diff --git a/sbin/dhclient/hash.c b/sbin/dhclient/hash.c
index 4f1795b24351..040236ab735b 100644
--- a/sbin/dhclient/hash.c
+++ b/sbin/dhclient/hash.c
@@ -40,6 +40,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 
 static int do_hash(unsigned char *, int, int);
diff --git a/sbin/dhclient/inet.c b/sbin/dhclient/inet.c
index a52847596e12..4b7b1cef1bad 100644
--- a/sbin/dhclient/inet.c
+++ b/sbin/dhclient/inet.c
@@ -42,6 +42,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 
 /*
diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c
index 9c8e8fc743f1..09aa4d8ffb64 100644
--- a/sbin/dhclient/options.c
+++ b/sbin/dhclient/options.c
@@ -40,6 +40,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <ctype.h>
 
 #define DHCP_OPTION_DATA
diff --git a/sbin/dhclient/packet.c b/sbin/dhclient/packet.c
index 1a22044d40a1..484953ca2d98 100644
--- a/sbin/dhclient/packet.c
+++ b/sbin/dhclient/packet.c
@@ -40,6 +40,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 
 #include <netinet/in_systm.h>
diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c
index 36eaf7f3bce1..6a54fd0a4c88 100644
--- a/sbin/dhclient/parse.c
+++ b/sbin/dhclient/parse.c
@@ -1,5 +1,4 @@
 /*	$OpenBSD: parse.c,v 1.11 2004/05/05 23:07:47 deraadt Exp $	*/
-/*	$FreeBSD$	*/
 
 /* Common parser code for dhcpd and dhclient. */
 
@@ -41,6 +40,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 #include "dhctoken.h"
 
diff --git a/sbin/dhclient/privsep.c b/sbin/dhclient/privsep.c
index cf47e56ceb6e..b42572f2895b 100644
--- a/sbin/dhclient/privsep.c
+++ b/sbin/dhclient/privsep.c
@@ -16,6 +16,9 @@
  * OF OR IN CONNECTION WITH THE USE, ABUSE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 #include "privsep.h"
 
diff --git a/sbin/dhclient/tables.c b/sbin/dhclient/tables.c
index 93ff6acce3df..2c3add2a27c8 100644
--- a/sbin/dhclient/tables.c
+++ b/sbin/dhclient/tables.c
@@ -1,5 +1,4 @@
 /*	$OpenBSD: tables.c,v 1.4 2004/05/04 20:28:40 deraadt Exp $	*/
-/*	$FreeBSD$	*/
 
 /* Tables of information... */
 
@@ -41,6 +40,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 
 /*
diff --git a/sbin/dhclient/tree.c b/sbin/dhclient/tree.c
index 89ac450ac5ba..0ed2919bb314 100644
--- a/sbin/dhclient/tree.c
+++ b/sbin/dhclient/tree.c
@@ -40,6 +40,9 @@
  * Enterprises, see ``http://www.vix.com''.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "dhcpd.h"
 
 extern int h_errno;