svn commit: r283237 - stable/10/usr.sbin/autofs

[Edward Tomasz Napierala]

Author: trasz
Date: Thu May 21 13:34:33 2015
New Revision: 283237
URL: https://svnweb.freebsd.org/changeset/base/283237

Log:
  MFC r279914:
  
  Options from auto_master must be appended to options from maps,
  not prepended.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/autofs/automountd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/autofs/automountd.c
==============================================================================
--- stable/10/usr.sbin/autofs/automountd.c	Thu May 21 13:33:06 2015	(r283236)
+++ stable/10/usr.sbin/autofs/automountd.c	Thu May 21 13:34:33 2015	(r283237)
@@ -232,7 +232,11 @@ handle_request(const struct autofs_daemo
 	}
 
 	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.