From owner-svn-src-stable@freebsd.org  Thu Sep 24 00:54:47 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC59AA0659E;
 Thu, 24 Sep 2015 00:54:47 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D43401339;
 Thu, 24 Sep 2015 00:54:47 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8O0sl1f036283;
 Thu, 24 Sep 2015 00:54:47 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8O0slSh036281;
 Thu, 24 Sep 2015 00:54:47 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201509240054.t8O0slSh036281@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 24 Sep 2015 00:54:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r288164 - stable/10/usr.bin/login
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Sep 2015 00:54:48 -0000

Author: delphij
Date: Thu Sep 24 00:54:46 2015
New Revision: 288164
URL: https://svnweb.freebsd.org/changeset/base/288164

Log:
  MFC r287634:
  
  login.c doesn't really need libutil.h, don't include it.
  
  login_fbtab.c includes paths.h and pathnames.h, and pathnames.h includes
  paths.h.  Eliminate the paths.h inclusion in login_fbtab.c.

Modified:
  stable/10/usr.bin/login/login.c
  stable/10/usr.bin/login/login_fbtab.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/login/login.c
==============================================================================
--- stable/10/usr.bin/login/login.c	Thu Sep 24 00:50:17 2015	(r288163)
+++ stable/10/usr.bin/login/login.c	Thu Sep 24 00:54:46 2015	(r288164)
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <errno.h>
 #include <grp.h>
-#include <libutil.h>
 #include <login_cap.h>
 #include <pwd.h>
 #include <setjmp.h>

Modified: stable/10/usr.bin/login/login_fbtab.c
==============================================================================
--- stable/10/usr.bin/login/login_fbtab.c	Thu Sep 24 00:50:17 2015	(r288163)
+++ stable/10/usr.bin/login/login_fbtab.c	Thu Sep 24 00:54:46 2015	(r288164)
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <errno.h>
 #include <glob.h>
-#include <paths.h>
 #include <stdio.h>
 #include <string.h>
 #include <syslog.h>
@@ -120,7 +119,7 @@ login_fbtab(char *tty, uid_t uid, gid_t 
 
 /* login_protect - protect one device entry */
 
-void
+static void
 login_protect(const char *table, char *pattern, int mask, uid_t uid, gid_t gid)
 {
     glob_t  gl;