Revert "Temporary hack out reentrant user database functions."
authorPeter Avalos <pavalos@theshell.com>
Sun, 22 Mar 2009 21:31:06 +0000 (11:31 -1000)
committerPeter Avalos <pavalos@theshell.com>
Tue, 7 Apr 2009 07:10:05 +0000 (21:10 -1000)
This reverts commit 75ce8d9fc3ccabbd5bd15bcf79ab1e7da8a5b4cb.

include/grp.h
include/pwd.h
lib/libc/gen/Makefile.inc

index be76f6f..e6feac5 100644 (file)
@@ -74,16 +74,13 @@ const char  *group_from_gid(gid_t, int);
 #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
 /* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */
 int             setgrent(void);
-#if 0
 int             getgrgid_r(gid_t, struct group *, char *, size_t,
                    struct group **);
 int             getgrnam_r(const char *, struct group *, char *, size_t,
                    struct group **);
 #endif
-#endif
-
 #if __BSD_VISIBLE
-/* int          getgrent_r(struct group *, char *, size_t, struct group **); */
+int             getgrent_r(struct group *, char *, size_t, struct group **);
 int             setgroupent(int);
 #endif
 __END_DECLS
index bee63ad..148b8b8 100644 (file)
@@ -148,16 +148,14 @@ struct passwd     *getpwuid(uid_t);
 void            endpwent(void);
 struct passwd  *getpwent(void);
 void            setpwent(void);
-#if 0
 int             getpwnam_r(const char *, struct passwd *, char *, size_t,
                    struct passwd **);
 int             getpwuid_r(uid_t, struct passwd *, char *, size_t,
                    struct passwd **);
 #endif
-#endif
 
 #if __BSD_VISIBLE
-/* int          getpwent_r(struct passwd *, char *, size_t, struct passwd **); */
+int             getpwent_r(struct passwd *, char *, size_t, struct passwd **);
 int             setpassent(int);
 const char     *user_from_uid(uid_t, int);
 #endif
index f020aec..111aba2 100644 (file)
@@ -37,11 +37,6 @@ SRCS+=  _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \
        ualarm.c ucontext.c ulimit.c uname.c unvis.c usleep.c utime.c \
        valloc.c vis.c wait.c wait3.c waitpid.c wordexp.c
 
-# Temporary hack to hide these symbols until we get a full implementation.
-CFLAGS+= -Dgetgrent_r=GETGRENT_R -Dgetgrnam_r=GETGRNAM_R \
-       -Dgetgrgid_r=GETGRGID_R -Dgetpwent_r=GETPWENT_R \
-       -Dgetpwnam_r=GETPWNAM_R -Dgetpwuid_r=GETPWUID_R
-
 .if ${LIB} != {c_rtld}
 SRCS+= tls.c
 .endif