summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/autofs/automountd.c6
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.
OpenPOWER on IntegriCloud