From owner-svn-src-all@FreeBSD.ORG  Tue Jun  7 15:40:18 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 567A2106578A;
	Tue,  7 Jun 2011 15:40:18 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 473BA8FC13;
	Tue,  7 Jun 2011 15:40:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p57FeIfA089776;
	Tue, 7 Jun 2011 15:40:18 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p57FeI4Y089774;
	Tue, 7 Jun 2011 15:40:18 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201106071540.p57FeI4Y089774@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 7 Jun 2011 15:40:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222824 - head/usr.sbin/rtadvd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jun 2011 15:40:18 -0000

Author: hrs
Date: Tue Jun  7 15:40:17 2011
New Revision: 222824
URL: http://svn.freebsd.org/changeset/base/222824

Log:
  Fix a bug that prevents tc=xxx from working.

Modified:
  head/usr.sbin/rtadvd/advcap.c

Modified: head/usr.sbin/rtadvd/advcap.c
==============================================================================
--- head/usr.sbin/rtadvd/advcap.c	Tue Jun  7 14:36:13 2011	(r222823)
+++ head/usr.sbin/rtadvd/advcap.c	Tue Jun  7 15:40:17 2011	(r222824)
@@ -81,7 +81,6 @@
 static	char *tbuf;
 static	int hopcount;	/* detect infinite loops in termcap, init 0 */
 
-static const char *remotefile;
 extern const char *conffile;
 
 int tgetent(char *, char *);
@@ -204,7 +203,7 @@ tnchktc(void)
 		write(STDERR_FILENO, "Infinite tc= loop\n", 18);
 		return (0);
 	}
-	if (getent(tcbuf, tcname, remotefile) != 1) {
+	if (getent(tcbuf, tcname, conffile) != 1) {
 		return (0);
 	}
 	for (q = tcbuf; *q++ != ':'; )