d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make automount(8) error out when the map name is missing.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
trasz 2017-05-04 19:41:19 +00:00
parent 7440f6af8b
commit 9bc2b16cd9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/autofs/common.c
View File

@ -224,6 +224,7 @@ 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;
@ -1122,6 +1123,10 @@ 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);