From owner-svn-src-all@FreeBSD.ORG  Mon Mar  2 03:08:46 2009
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 A54D9106566B;
	Mon,  2 Mar 2009 03:08:46 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 94EA68FC0A;
	Mon,  2 Mar 2009 03:08:46 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2238kt0063387;
	Mon, 2 Mar 2009 03:08:46 GMT (envelope-from cy@svn.freebsd.org)
Received: (from cy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2238kpb063385;
	Mon, 2 Mar 2009 03:08:46 GMT (envelope-from cy@svn.freebsd.org)
Message-Id: <200903020308.n2238kpb063385@svn.freebsd.org>
From: Cy Schubert <cy@FreeBSD.org>
Date: Mon, 2 Mar 2009 03:08:46 +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: r189267 - head/sbin/dump
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: Mon, 02 Mar 2009 03:08:47 -0000

Author: cy (ports committer)
Date: Mon Mar  2 03:08:46 2009
New Revision: 189267
URL: http://svn.freebsd.org/changeset/base/189267

Log:
  Verify that the filesystem being referenced in fstab is indeed a UFS
  filesystem. This avoids confusion with nullfs and unionfs filesystems
  which reference the root of a UFS filesystem as a target.
  
  PR:		116849
  Approved by:	kib

Modified:
  head/sbin/dump/optr.c

Modified: head/sbin/dump/optr.c
==============================================================================
--- head/sbin/dump/optr.c	Mon Mar  2 02:51:52 2009	(r189266)
+++ head/sbin/dump/optr.c	Mon Mar  2 03:08:46 2009	(r189267)
@@ -318,9 +318,10 @@ dump_getfstab(void)
 		return;
 	}
 	while ((fs = getfsent()) != NULL) {
-		if (strcmp(fs->fs_type, FSTAB_RW) &&
+		if ((strcmp(fs->fs_type, FSTAB_RW) &&
 		    strcmp(fs->fs_type, FSTAB_RO) &&
-		    strcmp(fs->fs_type, FSTAB_RQ))
+		    strcmp(fs->fs_type, FSTAB_RQ)) ||
+		    strcmp(fs->fs_vfstype, "ufs"))
 			continue;
 		fs = allocfsent(fs);
 		if ((pf = (struct pfstab *)malloc(sizeof (*pf))) == NULL)