From owner-svn-src-head@freebsd.org  Thu May  4 19:55:34 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 102E0D5D9E5;
 Thu,  4 May 2017 19:55:34 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 D4808FCF;
 Thu,  4 May 2017 19:55:33 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v44JtWAf036010;
 Thu, 4 May 2017 19:55:32 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v44JtWXx036009;
 Thu, 4 May 2017 19:55:32 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201705041955.v44JtWXx036009@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 4 May 2017 19:55:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317805 - head/usr.sbin/autofs
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 May 2017 19:55:34 -0000

Author: trasz
Date: Thu May  4 19:55:32 2017
New Revision: 317805
URL: https://svnweb.freebsd.org/changeset/base/317805

Log:
  Revert r317804; apparently I forgot the auto_master syntax.
  
  MFC after:	2 weeks

Modified:
  head/usr.sbin/autofs/common.c

Modified: head/usr.sbin/autofs/common.c
==============================================================================
--- head/usr.sbin/autofs/common.c	Thu May  4 19:41:19 2017	(r317804)
+++ head/usr.sbin/autofs/common.c	Thu May  4 19:55:32 2017	(r317805)
@@ -224,7 +224,6 @@ node_new_map(struct node *parent, char *
 		n->n_options = options;
 	else
 		n->n_options = strdup("");
-	assert(map != NULL);
 	n->n_map = map;
 	assert(config_file != NULL);
 	n->n_config_file = config_file;
@@ -1123,10 +1122,6 @@ parse_master_yyin(struct node *root, con
 		ret = yylex();
 		if (ret == 0 || ret == NEWLINE) {
 			if (mountpoint != NULL) {
-				if (map == NULL) {
-					log_errx(1, "missing map name "
-					    "at %s, line %d", master, lineno);
-				}
 				//log_debugx("adding map for %s", mountpoint);
 				node_new_map(root, mountpoint, options, map,
 				    master, lineno);