aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2017-05-04 19:55:32 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2017-05-04 19:55:32 +0000
commitd4acedbc64327ddc37cf5ac56b134423d5155161 (patch)
tree57a50b5f5362c3e521b1d59d3d8cc89c69a33fd0 /usr.sbin
parent1638f1d3e45483e1bc27645b9972d5a25ca24fa9 (diff)
downloadsrc-d4acedbc64327ddc37cf5ac56b134423d5155161.tar.gz
src-d4acedbc64327ddc37cf5ac56b134423d5155161.zip
Revert r317804; apparently I forgot the auto_master syntax.
MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=317805
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/autofs/common.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/usr.sbin/autofs/common.c b/usr.sbin/autofs/common.c
index 8a44139bed84..42b64f84bdda 100644
--- a/usr.sbin/autofs/common.c
+++ b/usr.sbin/autofs/common.c
@@ -224,7 +224,6 @@ node_new_map(struct node *parent, char *key, char *options, char *map,
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, const char *master)
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);