summaryrefslogtreecommitdiff
path: root/usr/src/head
diff options
context:
space:
mode:
authorDan McDonald <danmcd@joyent.com>2020-12-09 10:20:57 -0500
committerDan McDonald <danmcd@joyent.com>2020-12-09 10:20:57 -0500
commitb1e92d38ed920e9dcddad6df733657d248710c19 (patch)
tree2b08c2b687826e4b611727137322d145b0a4fb87 /usr/src/head
parentceb196aa4a6afed87153787b518d4cc7baf4adf1 (diff)
parentf2c438c5058c64b7373448f239156bf60009abcb (diff)
downloadillumos-joyent-b1e92d38ed920e9dcddad6df733657d248710c19.tar.gz
[illumos-gate merge]
commit f2c438c5058c64b7373448f239156bf60009abcb 7024 Add getgrouplist() to illumos commit adc528899caad05412c9b8d397e277900adf786b 13207 Creating an aggr with more than 128 Tx or Rx rings panics
Diffstat (limited to 'usr/src/head')
-rw-r--r--usr/src/head/grp.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/usr/src/head/grp.h b/usr/src/head/grp.h
index b5cea984f2..1a7e8ffb98 100644
--- a/usr/src/head/grp.h
+++ b/usr/src/head/grp.h
@@ -28,6 +28,8 @@
*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright 2020 Joyent, Inc.
*/
#ifndef _GRP_H
@@ -62,6 +64,7 @@ extern struct group *fgetgrent_r(FILE *, struct group *, char *, int);
extern struct group *fgetgrent(FILE *); /* MT-unsafe */
extern int initgroups(const char *, gid_t);
+extern int getgrouplist(const char *, gid_t, gid_t *, int *);
#endif /* defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) */
#if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2)
@@ -125,13 +128,6 @@ extern int __posix_getgrgid_r(gid_t, struct group *, char *, size_t,
extern int __posix_getgrnam_r(const char *, struct group *, char *, size_t,
struct group **);
-#ifdef __lint
-
-#define getgrgid_r __posix_getgrgid_r
-#define getgrnam_r __posix_getgrnam_r
-
-#else /* !__lint */
-
static int
getgrgid_r(gid_t __gid, struct group *__grp, char *__buf, size_t __len,
struct group **__res)
@@ -145,7 +141,6 @@ getgrnam_r(const char *__cb, struct group *__grp, char *__buf, size_t __len,
return (__posix_getgrnam_r(__cb, __grp, __buf, __len, __res));
}
-#endif /* !__lint */
#endif /* __PRAGMA_REDEFINE_EXTNAME */
#else /* (_POSIX_C_SOURCE - 0 >= 199506L) || ... */