From owner-svn-src-head@FreeBSD.ORG  Mon Nov 17 15:19:58 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 566E28D1;
 Mon, 17 Nov 2014 15:19:58 +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 4300F274;
 Mon, 17 Nov 2014 15:19:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHFJwCZ011912;
 Mon, 17 Nov 2014 15:19:58 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAHFJwQx011911;
 Mon, 17 Nov 2014 15:19:58 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201411171519.sAHFJwQx011911@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org
 using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 17 Nov 2014 15:19:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274631 - head/sbin/geom/core
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Nov 2014 15:19:58 -0000

Author: feld (ports committer)
Date: Mon Nov 17 15:19:57 2014
New Revision: 274631
URL: https://svnweb.freebsd.org/changeset/base/274631

Log:
  Fix geom's "usage" generation to not fabricate usage/help output for any
  imaginary class we give it.
  
  Differential Revision:	https://reviews.freebsd.org/D1150
  Submitted by:	homerj
  Approved by:	pjd

Modified:
  head/sbin/geom/core/geom.c

Modified: head/sbin/geom/core/geom.c
==============================================================================
--- head/sbin/geom/core/geom.c	Mon Nov 17 15:12:46 2014	(r274630)
+++ head/sbin/geom/core/geom.c	Mon Nov 17 15:19:57 2014	(r274631)
@@ -640,6 +640,11 @@ get_class(int *argc, char ***argv)
 #endif /* !STATIC_GEOM_CLASSES */
 
 	set_class_name();
+
+	/* If we can't load or list, it's not a class. */
+	if (!std_available("load") && !std_available("list"))
+		errx(EXIT_FAILURE, "Invalid class name.");
+
 	if (*argc < 1)
 		usage();
 }