From: millert <millert@openbsd.org>
Date: Sun, 18 Jan 2015 21:47:16 +0000 (+0000)
Subject: Back out previous.  HOST_NAME_MAX is only defined for newer POSIX
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=129656156f355eca4973e98c0c13d19f4debf996;p=openbsd

Back out previous.  HOST_NAME_MAX is only defined for newer POSIX
revisions so it is not safe to define MAXHOSTNAMELEN in terms of it.
---

diff --git a/sys/sys/param.h b/sys/sys/param.h
index 72716125be4..6c43583b53b 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.110 2015/01/17 15:03:09 millert Exp $	*/
+/*	$OpenBSD: param.h,v 1.111 2015/01/18 21:47:16 millert Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -74,7 +74,7 @@
 #define	NOFILE		OPEN_MAX	/* max open files per process (soft) */
 #define	NOFILE_MAX	1024		/* max open files per process (hard) */
 #define	NOGROUP		65535		/* marker for empty group set member */
-#define MAXHOSTNAMELEN	(HOST_NAME_MAX+1)	/* max hostname size */
+#define MAXHOSTNAMELEN	256		/* max hostname length w/ NUL */
 
 /* More types and definitions used throughout the kernel. */
 #ifdef _KERNEL
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 43b828d9e04..fdf5dc9d9bd 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syslimits.h,v 1.12 2013/03/24 19:55:45 guenther Exp $	*/
+/*	$OpenBSD: syslimits.h,v 1.13 2015/01/18 21:47:16 millert Exp $	*/
 /*	$NetBSD: syslimits.h,v 1.12 1995/10/05 05:26:19 thorpej Exp $	*/
 
 /*
@@ -73,5 +73,5 @@
 #endif /* __XPG_VISIBLE >= 500 || __POSIX_VISIBLE >= 199506 || __BSD_VISIBLE */
 
 #if __POSIX_VISIBLE >= 200112
-#define HOST_NAME_MAX		255
+#define HOST_NAME_MAX		255	/* max hostname length w/o NUL */
 #endif