From 1a8b24c2570fcb13c6bb5fd307c5afc08ef2faa5 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 2 Dec 2001 20:54:57 +0000
Subject: [PATCH] Use __FBSDID(). Also do a bit of cosmetic #if and
 header-order cleaning-up.

---
 .../modules/pam_login_access/login_access.c      |  5 ++++-
 usr.bin/login/login.c                            | 16 +++++-----------
 usr.bin/login/login_access.c                     |  5 ++++-
 usr.bin/login/login_fbtab.c                      |  5 ++++-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/libpam/modules/pam_login_access/login_access.c b/lib/libpam/modules/pam_login_access/login_access.c
index abd552b993d8..c058bbefc5a5 100644
--- a/lib/libpam/modules/pam_login_access/login_access.c
+++ b/lib/libpam/modules/pam_login_access/login_access.c
@@ -5,9 +5,12 @@
   * non-networked logins. Diagnostics are reported through syslog(3).
   *
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  * $FreeBSD$
   */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifdef LOGIN_ACCESS
 #ifndef lint
 static const char sccsid[] = "%Z% %M% %I% %E% %U%";
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 99d64bd832f0..4f24d371eb22 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -31,19 +31,13 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
+static const char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 /*
  * login [ name ]
@@ -51,8 +45,8 @@ static const char rcsid[] =
  * login -f name	(for pre-authenticated login: datakit, xterm, etc.)
  */
 
-#include <sys/param.h>
 #include <sys/copyright.h>
+#include <sys/param.h>
 #include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
diff --git a/usr.bin/login/login_access.c b/usr.bin/login/login_access.c
index abd552b993d8..c058bbefc5a5 100644
--- a/usr.bin/login/login_access.c
+++ b/usr.bin/login/login_access.c
@@ -5,9 +5,12 @@
   * non-networked logins. Diagnostics are reported through syslog(3).
   *
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  * $FreeBSD$
   */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifdef LOGIN_ACCESS
 #ifndef lint
 static const char sccsid[] = "%Z% %M% %I% %E% %U%";
diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c
index 6943d02f1023..599e3a631e56 100644
--- a/usr.bin/login/login_fbtab.c
+++ b/usr.bin/login/login_fbtab.c
@@ -13,7 +13,6 @@
 * warranties, including, without limitation, the implied warranties of
 * merchantibility and fitness for any particular purpose.
 ************************************************************************/
-/* $FreeBSD$ */
 /*
     SYNOPSIS
 	void login_fbtab(tty, uid, gid)
@@ -59,6 +58,10 @@
 	The Netherlands
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>