[illumos-gate merge]

commit 65c41f67aac8a7bee885d3a98aada4dc3ee7b982
    8754 loader: pass a "illumos" user-class in PXE dhcp request
commit 569b224861c1ba385ca080ad7101b96d07415f91
    6105 mailer.conf man page lists incorrect path /etc/mail/mailer.conf in FILES section

3 files changed, 20 insertions, 17 deletions

diff --git a/usr/src/boot/lib/libstand/bootp.c b/usr/src/boot/lib/libstand/bootp.c
index e4bbccfcaf..2dac122970 100644
--- a/usr/src/boot/lib/libstand/bootp.c
+++ b/usr/src/boot/lib/libstand/bootp.c
@@ -1,5 +1,3 @@
-/*	$NetBSD: bootp.c,v 1.14 1998/02/16 11:10:54 drochner Exp $	*/
-
 /*
  * Copyright (c) 1992 Regents of the University of California.
  * All rights reserved.
@@ -16,7 +14,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,8 +29,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp  (LBL)
  */
 
 #include <sys/cdefs.h>
@@ -145,16 +141,22 @@ bootp(int sock, int flag)
 		bp->bp_vend[7] = TAG_CLASSID;
 		bp->bp_vend[8] = 9;
 		bcopy("PXEClient", &bp->bp_vend[9], 9);
-		bp->bp_vend[18] = TAG_PARAM_REQ;
-		bp->bp_vend[19] = 7;
-		bp->bp_vend[20] = TAG_ROOTPATH;
-		bp->bp_vend[21] = TAG_HOSTNAME;
-		bp->bp_vend[22] = TAG_SWAPSERVER;
-		bp->bp_vend[23] = TAG_GATEWAY;
-		bp->bp_vend[24] = TAG_SUBNET_MASK;
-		bp->bp_vend[25] = TAG_INTF_MTU;
-		bp->bp_vend[26] = TAG_SERVERID;
-		bp->bp_vend[27] = TAG_END;
+		bp->bp_vend[18] = TAG_USER_CLASS;
+		/* len of each user class + number of user class */
+		bp->bp_vend[19] = 8;
+		/* len of the first user class */
+		bp->bp_vend[20] = 7;
+		bcopy("illumos", &bp->bp_vend[21], 7);
+		bp->bp_vend[28] = TAG_PARAM_REQ;
+		bp->bp_vend[29] = 7;
+		bp->bp_vend[30] = TAG_ROOTPATH;
+		bp->bp_vend[31] = TAG_HOSTNAME;
+		bp->bp_vend[32] = TAG_SWAPSERVER;
+		bp->bp_vend[33] = TAG_GATEWAY;
+		bp->bp_vend[34] = TAG_SUBNET_MASK;
+		bp->bp_vend[35] = TAG_INTF_MTU;
+		bp->bp_vend[36] = TAG_SERVERID;
+		bp->bp_vend[37] = TAG_END;
 	} else
 		bp->bp_vend[7] = TAG_END;
 #else
diff --git a/usr/src/boot/lib/libstand/bootp.h b/usr/src/boot/lib/libstand/bootp.h
index 89fd978aab..c1aa218231 100644
--- a/usr/src/boot/lib/libstand/bootp.h
+++ b/usr/src/boot/lib/libstand/bootp.h
@@ -108,6 +108,7 @@ struct bootp {
 #define TAG_T2			((unsigned char)  59)
 #define TAG_CLASSID		((unsigned char)  60)
 #define TAG_CLIENTID		((unsigned char)  61)
+#define TAG_USER_CLASS		((unsigned char)  77)
 #endif
 
 #define TAG_END			((unsigned char) 255)
diff --git a/usr/src/man/man4/mailer.conf.4 b/usr/src/man/man4/mailer.conf.4
index b4d52c608f..a46f0160e4 100644
--- a/usr/src/man/man4/mailer.conf.4
+++ b/usr/src/man/man4/mailer.conf.4
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD: releng/9.1/share/man/man5/mailer.conf.5 213609 2010-10-08 20:13:12Z markm $
 .\"
-.Dd October 8, 2010
+.Dd November 11, 2017
 .Dt MAILER.CONF 4
 .Os
 .Sh NAME
@@ -83,7 +83,7 @@ The file may also contain comment lines, denoted by a
 .Ql #
 mark in the first column of any line.
 .Sh FILES
-/etc/mail/mailer.conf
+/etc/mailer.conf
 .Sh EXAMPLES
 This example shows how to set up
 .Nm