diff options
| author | trasz <trasz@FreeBSD.org> | 2015-05-21 13:34:33 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2015-05-21 13:34:33 +0000 |
| commit | 5d932fec110b4522fa6e6bc7cfcb90cf0a8cff4b (patch) | |
| tree | 25fe8db038acbcba31709b8b1c0d592d145edfac | |
| parent | decca16d96f44d804fd0e0bcb86aed5fbc833f06 (diff) | |
| download | FreeBSD-src-5d932fec110b4522fa6e6bc7cfcb90cf0a8cff4b.zip FreeBSD-src-5d932fec110b4522fa6e6bc7cfcb90cf0a8cff4b.tar.gz | |
MFC r279914:
Options from auto_master must be appended to options from maps,
not prepended.
Sponsored by: The FreeBSD Foundation
| -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 168e8b3..191e712 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. |
