Make namespace protection feature tests for reentrant functions more

accurate (and actually less restrictive).
This commit is contained in:
kleink 2005-05-24 17:36:29 +00:00
parent e45ea581c3
commit abf1d9c9d1
2 changed files with 16 additions and 10 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: grp.h,v 1.21 2005/04/02 04:54:35 christos Exp $ */ /* $NetBSD: grp.h,v 1.22 2005/05/24 17:36:29 kleink Exp $ */
/*- /*-
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -57,15 +57,18 @@ struct group {
__BEGIN_DECLS __BEGIN_DECLS
struct group *getgrgid(gid_t); struct group *getgrgid(gid_t);
struct group *getgrnam(const char *); struct group *getgrnam(const char *);
#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) #if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
struct group *getgrent(void); defined(_REENTRANT) || defined(_NETBSD_SOURCE)
void setgrent(void);
void endgrent(void);
int getgrgid_r(gid_t, struct group *, char *, size_t, int getgrgid_r(gid_t, struct group *, char *, size_t,
struct group **); struct group **);
int getgrnam_r(const char *, struct group *, char *, size_t, int getgrnam_r(const char *, struct group *, char *, size_t,
struct group **); struct group **);
#endif #endif
#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
struct group *getgrent(void);
void setgrent(void);
void endgrent(void);
#endif
#if defined(_NETBSD_SOURCE) #if defined(_NETBSD_SOURCE)
void setgrfile(const char *); void setgrfile(const char *);
int setgroupent(int); int setgroupent(int);

View File

@ -1,4 +1,4 @@
/* $NetBSD: pwd.h,v 1.38 2005/04/02 04:54:35 christos Exp $ */ /* $NetBSD: pwd.h,v 1.39 2005/05/24 17:36:29 kleink Exp $ */
/*- /*-
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -120,15 +120,18 @@ struct passwd {
__BEGIN_DECLS __BEGIN_DECLS
struct passwd *getpwuid(uid_t); struct passwd *getpwuid(uid_t);
struct passwd *getpwnam(const char *); struct passwd *getpwnam(const char *);
#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) #if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
struct passwd *getpwent(void); defined(_REENTRANT) || defined(_NETBSD_SOURCE)
void setpwent(void);
void endpwent(void);
int getpwnam_r(const char *, struct passwd *, char *, size_t, int getpwnam_r(const char *, struct passwd *, char *, size_t,
struct passwd **); struct passwd **);
int getpwuid_r(uid_t, struct passwd *, char *, size_t, int getpwuid_r(uid_t, struct passwd *, char *, size_t,
struct passwd **); struct passwd **);
#endif #endif
#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
struct passwd *getpwent(void);
void setpwent(void);
void endpwent(void);
#endif
#if defined(_NETBSD_SOURCE) #if defined(_NETBSD_SOURCE)
int pw_gensalt(char *, size_t, const char *, const char *); int pw_gensalt(char *, size_t, const char *, const char *);
int pw_scan(char *, struct passwd *, int *); int pw_scan(char *, struct passwd *, int *);