summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-11-06 12:15:19 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:44:34 +0100
commit8867f82611e232a0752fad27db915b20da5c56bb (patch)
tree504e1e40b7eb284b3686a148a0088b0716e93b4b
parent32bed4d0fbd2acf3570ccb75cc046eee064b063b (diff)
downloadsamba-8867f82611e232a0752fad27db915b20da5c56bb.tar.gz
samba-8867f82611e232a0752fad27db915b20da5c56bb.tar.bz2
samba-8867f82611e232a0752fad27db915b20da5c56bb.zip
r25872: 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 (This used to be commit e99feb5ff5f22522b902fe523e9aee80856ba422)
-rw-r--r--source4/lib/nss_wrapper/nss_wrapper.c62
1 files changed, 0 insertions, 62 deletions
diff --git a/source4/lib/nss_wrapper/nss_wrapper.c b/source4/lib/nss_wrapper/nss_wrapper.c
index 6d26588fff..f4ea9bb6de 100644
--- a/source4/lib/nss_wrapper/nss_wrapper.c
+++ b/source4/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)
{