From 5d932fec110b4522fa6e6bc7cfcb90cf0a8cff4b Mon Sep 17 00:00:00 2001 From: trasz Date: Thu, 21 May 2015 13:34:33 +0000 Subject: MFC r279914: Options from auto_master must be appended to options from maps, not prepended. Sponsored by: The FreeBSD Foundation --- usr.sbin/autofs/automountd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'usr.sbin') 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. -- cgit v1.1