svn commit: r279914 - head/usr.sbin/autofs

[Edward Tomasz Napierala]

Author: trasz
Date: Thu Mar 12 12:14:11 2015
New Revision: 279914
URL: https://svnweb.freebsd.org/changeset/base/279914

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

Modified:
  head/usr.sbin/autofs/automountd.c

Modified: head/usr.sbin/autofs/automountd.c
==============================================================================
--- head/usr.sbin/autofs/automountd.c	Thu Mar 12 10:20:53 2015	(r279913)
+++ head/usr.sbin/autofs/automountd.c	Thu Mar 12 12:14:11 2015	(r279914)
@@ -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.