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

Options from auto_master must be appended to options from maps,

Browse Source 
not prepended.

MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Edward Tomasz Napierala 2015-03-12 12:14:11 +00:00
parent 7715befdf2
commit 5c16a48aec
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=279914
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.