From 5c16a48aecfe192658bb1868e9fc1a29ca470a8c Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 12 Mar 2015 12:14:11 +0000
Subject: [PATCH] Options from auto_master must be appended to options from
 maps, not prepended.

MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
---
 usr.sbin/autofs/automountd.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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.