nss_wrapper: revert solaris get*ent_r() functions

This was the wrong approach, as in future lib/replace
should hide this special solaris stuff.

metze

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25872 0c0555d6-39d7-0310-84fc-f1cc0bd64818
(This used to be commit 350d6c19e3e933804ce7234f21ef008c74894e2e)

diff --git a/source3/lib/nss_wrapper/nss_wrapper.c b/source3/lib/nss_wrapper/nss_wrapper.c
index 6d26588fff9b2665c38bb5331cf84a836fb6db49..f4ea9bb6de17b65c79f84a286176a4c2532b0b50 100644 (file)
--- a/source3/lib/nss_wrapper/nss_wrapper.c
+++ b/source3/lib/nss_wrapper/nss_wrapper.c
@@ -900,36 +900,6 @@ _PUBLIC_ struct passwd *nwrap_getpwent(void)
        return pw;
 }
 
-#ifdef SOLARIS_GETPWENT_R
-_PUBLIC_ struct passwd *nwrap_getpwent_r(struct passwd *pwdst,
-                                        char *buf,
-                                        int buflen)
-{
-       struct passwd *pw;
-       struct passwd *pwdstp = NULL;
-       int ret;
-
-       if (!nwrap_enabled()) {
-               return real_getpwent_r(pwdst, buf, buflen);
-       }
-
-       pw = nwrap_getpwent();
-       if (!pw) {
-               if (errno == 0) {
-                       errno = ENOENT;
-               }
-               return NULL;
-       }
-
-       ret = nwrap_pw_copy_r(pw, pwdst, buf, buflen, &pwdstp);
-       if (ret != 0) {
-               errno = ret;
-               return NULL;
-       }
-
-       return pwdstp;
-}
-#else
 _PUBLIC_ int nwrap_getpwent_r(struct passwd *pwdst, char *buf,
                              size_t buflen, struct passwd **pwdstp)
 {
@@ -949,7 +919,6 @@ _PUBLIC_ int nwrap_getpwent_r(struct passwd *pwdst, char *buf,
 
        return nwrap_pw_copy_r(pw, pwdst, buf, buflen, pwdstp);
 }
-#endif
 
 _PUBLIC_ void nwrap_endpwent(void)
 {
@@ -1103,36 +1072,6 @@ _PUBLIC_ struct group *nwrap_getgrent(void)
        return gr;
 }
 
-#ifdef SOLARIS_GETGRENT_R
-_PUBLIC_ struct group *nwrap_getgrent_r(struct group *grdst,
-                                       char *buf,
-                                       int buflen)
-{
-       struct group *gr;
-       struct group *grdstp = NULL;
-       int ret;
-
-       if (!nwrap_enabled()) {
-               return real_getgrent_r(grdst, buf, buflen);
-       }
-
-       gr = nwrap_getgrent();
-       if (!gr) {
-               if (errno == 0) {
-                       errno = ENOENT;
-               }
-               return NULL;
-       }
-
-       ret = nwrap_gr_copy_r(gr, grdst, buf, buflen, &grdstp);
-       if (ret != 0) {
-               errno = ret;
-               return NULL;
-       }
-
-       return grdstp;
-}
-#else
 _PUBLIC_ int nwrap_getgrent_r(struct group *grdst, char *buf,
                              size_t buflen, struct group **grdstp)
 {
@@ -1152,7 +1091,6 @@ _PUBLIC_ int nwrap_getgrent_r(struct group *grdst, char *buf,
 
        return nwrap_gr_copy_r(gr, grdst, buf, buflen, grdstp);
 }
-#endif
 
 _PUBLIC_ void nwrap_endgrent(void)
 {