From owner-svn-src-stable@FreeBSD.ORG  Thu Sep 25 17:28:30 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4FA49A9D;
 Thu, 25 Sep 2014 17:28:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 3A323222;
 Thu, 25 Sep 2014 17:28:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8PHSUIW091693;
 Thu, 25 Sep 2014 17:28:30 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8PHSU0W091692;
 Thu, 25 Sep 2014 17:28:30 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201409251728.s8PHSU0W091692@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 25 Sep 2014 17:28:30 +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: r272116 - stable/10/sys/fs/autofs
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.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Sep 2014 17:28:30 -0000

Author: trasz
Date: Thu Sep 25 17:28:29 2014
New Revision: 272116
URL: http://svnweb.freebsd.org/changeset/base/272116

Log:
  MFC r272025:
  
  Fix thinko that, with two map entries like shown below, in that order,
  made autofs mix them up: the second one wasn't visible in ls(1) output,
  and trying to access it would trigger mount for the first one.
  
  foobar          host:/foobar
  foo             host:/foo
  
  Approved by:	re (gjb)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/fs/autofs/autofs_vnops.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/autofs/autofs_vnops.c
==============================================================================
--- stable/10/sys/fs/autofs/autofs_vnops.c	Thu Sep 25 16:48:23 2014	(r272115)
+++ stable/10/sys/fs/autofs/autofs_vnops.c	Thu Sep 25 17:28:29 2014	(r272116)
@@ -544,6 +544,8 @@ autofs_node_find(struct autofs_node *par
 
 	TAILQ_FOREACH(anp, &parent->an_children, an_next) {
 		if (namelen >= 0) {
+			if (strlen(anp->an_name) != namelen)
+				continue;
 			if (strncmp(anp->an_name, name, namelen) != 0)
 				continue;
 		} else {