[illumos-gate merge]

commit 746f551ddc191f00808cd4121966c1ee42d5b74f
    2989 LOGNAME_MAX should be increased to 32 (fix gcc build)
commit 23b68ef4aef54d7487e138ec22eafdfc83844017
    4016 disk-monitor should activate fault/fail indicators (remove build artifact)
commit ad7ed3fec423fe5215f6da8888d44a36514ee898
    4182 proto_promisc* miss calls to mac_perim_exit
commit 5691611ed44f54317a0e6ff4526c4cc0d8bca9b3
    2989 LOGNAME_MAX should be increased to 32 (missing file)
commit 0a1278f26ea4b7c8c0285d4f2d6c5b680904aa01
    2989 LOGNAME_MAX should be increased to 32
    1166 useradd warns on names with more than 8 chars

Conflicts:
	usr/src/cmd/passwd/passwd.c (OS-1836, superceded)
	usr/src/man/man1m/prstat.1m (OS-1044, keep)
	usr/src/lib/libc/port/gen/getlogin.c (OS-1836, superceded)
	usr/src/head/unistd.h (OS-1836, superceded)
	usr/src/cmd/prstat/prutil.c (OS-1044, keep)
	usr/src/cmd/prstat/prstat.c (OS-1044, keep)

4 files changed, 114 insertions, 51 deletions

diff --git a/usr/src/lib/libc/port/gen/getlogin.c b/usr/src/lib/libc/port/gen/getlogin.c
index e96d294fd0..08f29ec363 100644
--- a/usr/src/lib/libc/port/gen/getlogin.c
+++ b/usr/src/lib/libc/port/gen/getlogin.c
@@ -20,6 +20,8 @@
  */
 
 /*
+ * Copyright (c) 2013 Gary Mills
+ *
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -27,12 +29,8 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-/*
- * Copyright (c) 2013 Joyent, Inc.  All rights reserved.
- */
-
-#pragma weak _getlogin = getlogin
-#pragma weak _getlogin_r = getlogin_r
+#pragma weak _getlogin = getloginx
+#pragma weak _getlogin_r = getloginx_r
 
 #include "lint.h"
 #include <sys/types.h>
@@ -50,41 +48,66 @@
 #include <mtlib.h>
 #include "tsd.h"
 
+/* Revert the renames done in unistd.h */
+#ifdef	__PRAGMA_REDEFINE_EXTNAME
+#pragma	redefine_extname	getlogint	getlogin
+#pragma	redefine_extname	getlogint_r	getlogin_r
+#pragma	redefine_extname	__posix_getlogint_r	__posix_getlogin_r
+#else	/* __PRAGMA_REDEFINE_EXTNAME */
+#ifdef	getlogin
+#undef	getlogin
+#endif	/* getlogin */
+#ifdef	getlogin_r
+#undef	getlogin_r
+#endif	/* getlogin_r */
+#ifdef	__posix_getlogin_r
+#undef	__posix_getlogin_r
+#endif	/* __posix_getlogin_r */
+#define	getlogint	getlogin
+#define	getlogint_r	getlogin_r
+#define	__posix_getlogint_r	__posix_getlogin_r
+#endif	/* __PRAGMA_REDEFINE_EXTNAME */
+extern char *getlogint(void);
+extern char *getlogint_r(char *, int);
+extern int __posix_getlogint_r(char *, int);
+
 /*
- * XXX - _POSIX_LOGIN_NAME_MAX limits the length of a login name.  The utmpx
- * interface provides for a 32 character login name, but for the sake of
- * compatibility, we are still using the old utmp-imposed limit.
- *
- * If you want the full name, use the Consolidation Private getxlogin().
+ * Use the full length of a login name.
+ * The utmpx interface provides for a 32 character login name.
  */
+#define	NMAX	(sizeof (((struct utmpx *)0)->ut_user))
 
-static int
-generic_getlogin(char *answer, int namelen, boolean_t truncate)
+/*
+ * Common function
+ */
+static char *
+getl_r_common(char *answer, size_t namelen, size_t maxlen)
 {
 	int		uf;
 	off64_t		me;
 	struct futmpx	ubuf;
 
 	if ((me = (off64_t)ttyslot()) < 0)
-		return (-1);
+		return (NULL);
 	if ((uf = open64(UTMPX_FILE, 0)) < 0)
-		return (-1);
+		return (NULL);
 	(void) lseek64(uf, me * sizeof (ubuf), SEEK_SET);
 	if (read(uf, &ubuf, sizeof (ubuf)) != sizeof (ubuf)) {
 		(void) close(uf);
-		return (-1);
+		return (NULL);
 	}
 	(void) close(uf);
 	if (ubuf.ut_user[0] == '\0')
-		return (-1);
-	if (strnlen(ubuf.ut_user, sizeof (ubuf.ut_user)) >= namelen &&
-	    !truncate) {
+		return (NULL);
+
+	/* Insufficient buffer size */
+	if (namelen < strnlen(&ubuf.ut_user[0], maxlen)) {
 		errno = ERANGE;
-		return (-1);
+		return (NULL);
 	}
-	(void) strlcpy(answer, ubuf.ut_user, namelen);
-
-	return (0);
+	(void) strncpy(&answer[0], &ubuf.ut_user[0], maxlen);
+	answer[maxlen] = '\0';
+	return (&answer[0]);
 }
 
 /*
@@ -92,17 +115,9 @@ generic_getlogin(char *answer, int namelen, boolean_t truncate)
  * It was implemented by Solaris 2.3.
  */
 char *
-getlogin_r(char *answer, int namelen)
+getlogint_r(char *answer, int namelen)
 {
-	if (namelen < _POSIX_LOGIN_NAME_MAX) {
-		errno = ERANGE;
-		return (NULL);
-	}
-
-	if (generic_getlogin(answer, _POSIX_LOGIN_NAME_MAX, B_TRUE) == 0)
-		return (answer);
-
-	return (NULL);
+	return (getl_r_common(answer, (size_t)namelen, LOGNAME_MAX_TRAD));
 }
 
 /*
@@ -110,13 +125,13 @@ getlogin_r(char *answer, int namelen)
  * User gets it via static getlogin_r from the header file.
  */
 int
-__posix_getlogin_r(char *name, int namelen)
+__posix_getlogint_r(char *name, int namelen)
 {
 	int nerrno = 0;
 	int oerrno = errno;
 
 	errno = 0;
-	if (getlogin_r(name, namelen) != 0) {
+	if (getl_r_common(name, (size_t)namelen, LOGNAME_MAX_TRAD) == NULL) {
 		if (errno == 0)
 			nerrno = EINVAL;
 		else
@@ -127,30 +142,57 @@ __posix_getlogin_r(char *name, int namelen)
 }
 
 char *
-getlogin(void)
+getlogint(void)
 {
-	struct futmpx fu;
-	char *answer = tsdalloc(_T_LOGIN,
-	    MAX(sizeof (fu.ut_user), _POSIX_LOGIN_NAME_MAX), NULL);
+	char *answer = tsdalloc(_T_LOGIN, LOGIN_NAME_MAX_TRAD, NULL);
 
 	if (answer == NULL)
 		return (NULL);
-	return (getlogin_r(answer, _POSIX_LOGIN_NAME_MAX));
+	return (getl_r_common(answer, LOGIN_NAME_MAX_TRAD, LOGNAME_MAX_TRAD));
 }
 
+/*
+ * POSIX.1c Draft-6 version of the function getlogin_r.
+ * It was implemented by Solaris 2.3.
+ * For extended login names, selected by redefine_extname in unistd.h.
+ */
 char *
-getxlogin(void)
+getloginx_r(char *answer, int namelen)
 {
-	struct futmpx fu;
-	char *answer = tsdalloc(_T_LOGIN,
-	    MAX(sizeof (fu.ut_user), _POSIX_LOGIN_NAME_MAX), NULL);
+	return (getl_r_common(answer, (size_t)namelen, NMAX));
+}
 
-	if (answer == NULL)
-		return (NULL);
+/*
+ * POSIX.1c standard version of the function getlogin_r.
+ * User gets it via static getlogin_r from the header file.
+ * For extended login names, selected by redefine_extname in unistd.h.
+ */
+int
+__posix_getloginx_r(char *name, int namelen)
+{
+	int nerrno = 0;
+	int oerrno = errno;
 
-	if (generic_getlogin(answer,
-	    MAX(sizeof (fu.ut_user), _POSIX_LOGIN_NAME_MAX), B_FALSE) != 0)
-		return (NULL);
+	errno = 0;
+	if (getl_r_common(name, (size_t)namelen, NMAX) == NULL) {
+		if (errno == 0)
+			nerrno = EINVAL;
+		else
+			nerrno = errno;
+	}
+	errno = oerrno;
+	return (nerrno);
+}
 
-	return (answer);
+/*
+ * For extended login names, selected by redefine_extname in unistd.h.
+ */
+char *
+getloginx(void)
+{
+	char *answer = tsdalloc(_T_LOGIN, LOGIN_NAME_MAX, NULL);
+
+	if (answer == NULL)
+		return (NULL);
+	return (getl_r_common(answer, LOGIN_NAME_MAX, NMAX));
 }
diff --git a/usr/src/lib/libc/port/gen/sysconf.c b/usr/src/lib/libc/port/gen/sysconf.c
index 8c2e6f4eb2..8e852ce1c8 100644
--- a/usr/src/lib/libc/port/gen/sysconf.c
+++ b/usr/src/lib/libc/port/gen/sysconf.c
@@ -20,6 +20,8 @@
  */
 
 /*
+ * Copyright (c) 2013 Gary Mills
+ *
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -372,7 +374,7 @@ sysconf(int name)
 			return ((long)NSS_BUFLEN_PASSWD);
 
 		case _SC_LOGIN_NAME_MAX:
-			return ((long)(LOGNAME_MAX + 1));
+			return ((long)(LOGIN_NAME_MAX));
 
 		case _SC_THREAD_KEYS_MAX:
 			return (-1L);
diff --git a/usr/src/lib/libc/port/llib-lc b/usr/src/lib/libc/port/llib-lc
index 1781f34b2b..eb2fb4357b 100644
--- a/usr/src/lib/libc/port/llib-lc
+++ b/usr/src/lib/libc/port/llib-lc
@@ -23,6 +23,7 @@
  * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  * Copyright 2013 OmniTI Computer Consulting, Inc. All rights reserved.
+ * Copyright (c) 2013 Gary Mills
  */
 
 /* LINTLIBRARY */
@@ -194,6 +195,7 @@ char *__posix_asctime_r(const struct tm *_RESTRICT_KYWD, char *_RESTRICT_KYWD);
 char *__posix_ctime_r(const time_t *, char *);
 int __posix_ttyname_r(int, char *, size_t);
 int __posix_getlogin_r(char *, int);
+int __posix_getloginx_r(char *, int);
 
 /*
  * XPG4 versions of standard libc routines; these aren't extracted
@@ -477,7 +479,15 @@ int gethz(void);
 uint_t getisax(uint32_t *, uint_t);
 
 /* getlogin.c */
+char *getloginx(void);
+char *getloginx_r(char *, int);
+#ifdef	getlogin
+#undef	getlogin
+#endif	/* getlogin */
 char *getlogin(void);
+#ifdef	getlogin_r
+#undef	getlogin_r
+#endif	/* getlogin_r */
 char *getlogin_r(char *, int);
 
 /* getmntent.c */
diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers
index ae0034931d..09b14063cb 100644
--- a/usr/src/lib/libc/port/mapfile-vers
+++ b/usr/src/lib/libc/port/mapfile-vers
@@ -27,6 +27,8 @@
 # Copyright (c) 2012, Joyent, Inc. All rights reserved.
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved.
+# Copyright (c) 2013 Gary Mills
+#
 
 #
 # MAPFILE HEADER START
@@ -91,6 +93,13 @@ $if _x86 && _ELF64
 $add amd64
 $endif
 
+SYMBOL_VERSION ILLUMOS_0.6 {	# Illumos additions
+    protected:
+	getloginx;
+	getloginx_r;
+	__posix_getloginx_r;
+} ILLUMOS_0.5;
+
 SYMBOL_VERSION ILLUMOS_0.5 {	# common C++ ABI exit handlers
     protected:
 	__cxa_atexit;