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

MFC r279914:

Browse Source 
Options from auto_master must be appended to options from maps,
not prepended.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
trasz 2015-05-21 13:34:33 +00:00
parent decca16d96
commit 5d932fec11
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/autofs/automountd.c
View File

@ -232,7 +232,11 @@ handle_request(const struct autofs_daemon_request *adr, char *cmdline_options,
}
options = node_options(node);
options = concat(adr->adr_options, ',', options);
/*
* Append options from auto_master.
*/
options = concat(options, ',', adr->adr_options);
/*
* Prepend options passed via automountd(8) command line.