diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2015-03-12 12:14:11 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2015-03-12 12:14:11 +0000 |
| commit | 5c16a48aecfe192658bb1868e9fc1a29ca470a8c (patch) | |
| tree | 280bb4acd4a18154e2b373a7bc1bf561bd3f24b8 /usr.sbin/autofs/automountd.c | |
| parent | 7715befdf236e581ead7df038524f269c36ea8e8 (diff) | |
| download | src-5c16a48aecfe192658bb1868e9fc1a29ca470a8c.tar.gz src-5c16a48aecfe192658bb1868e9fc1a29ca470a8c.zip | |
Options from auto_master must be appended to options from maps,
not prepended.
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=279914
Diffstat (limited to 'usr.sbin/autofs/automountd.c')
| -rw-r--r-- | usr.sbin/autofs/automountd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/autofs/automountd.c b/usr.sbin/autofs/automountd.c index 168e8b31a428..191e71240651 100644 --- a/usr.sbin/autofs/automountd.c +++ b/usr.sbin/autofs/automountd.c @@ -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. |