summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-10 16:00:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:54 -0500
commit4cc500433d07decf8fc2551b117e15537f6c8558 (patch)
tree0c20d594432c5a5ea44e5dbc7776c54fed844535
parent892c8cd1b43178e7ba600f111289d5843826734e (diff)
downloadsamba-4cc500433d07decf8fc2551b117e15537f6c8558.tar.gz
samba-4cc500433d07decf8fc2551b117e15537f6c8558.tar.bz2
samba-4cc500433d07decf8fc2551b117e15537f6c8558.zip
r22152: merge from samba3:
remove netgr functions from libreplace they're not used in samba4 currently and samba3 has explicit configure checks for them. should fix bug #4496 metze (This used to be commit dd83a8dad8ad89a1485598fa6e11c9128d04e6d7)
-rw-r--r--source4/lib/replace/README2
-rw-r--r--source4/lib/replace/libreplace.m45
-rw-r--r--source4/lib/replace/replace.c27
-rw-r--r--source4/lib/replace/test/testsuite.c7
4 files changed, 2 insertions, 39 deletions
diff --git a/source4/lib/replace/README b/source4/lib/replace/README
index 6610b7c279..8fe9f24e79 100644
--- a/source4/lib/replace/README
+++ b/source4/lib/replace/README
@@ -12,7 +12,6 @@ strlcpy
strlcat
mktime
rename
-innetgr
initgroups
memmove
strdup
@@ -89,5 +88,4 @@ stdbool.h
Prerequisites:
memset (for bzero)
syslog (for vsyslog)
-setnetgrent, getnetgrent, endnetgrent (for innetgr)
mktemp (for mkstemp and mkdtemp)
diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4
index b5f931c7e4..12be9f6016 100644
--- a/source4/lib/replace/libreplace.m4
+++ b/source4/lib/replace/libreplace.m4
@@ -150,7 +150,7 @@ AC_TRY_COMPILE([
AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
-AC_CHECK_FUNCS(waitpid strlcpy strlcat innetgr initgroups memmove strdup)
+AC_CHECK_FUNCS(waitpid strlcpy strlcat initgroups memmove strdup)
AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp socketpair)
AC_HAVE_DECL(setresuid, [#include <unistd.h>])
AC_HAVE_DECL(setresgid, [#include <unistd.h>])
@@ -331,8 +331,7 @@ m4_include(win32.m4)
m4_include(timegm.m4)
m4_include(repdir.m4)
-AC_CHECK_FUNCS([syslog memset setnetgrent getnetgrent endnetgrent memcpy],,
- [AC_MSG_ERROR([Required function not found])])
+AC_CHECK_FUNCS([syslog memset memcpy],,[AC_MSG_ERROR([Required function not found])])
echo "LIBREPLACE_BROKEN_CHECKS: END"
]) dnl end AC_LIBREPLACE_BROKEN_CHECKS
diff --git a/source4/lib/replace/replace.c b/source4/lib/replace/replace.c
index 03888a8eee..db299130e5 100644
--- a/source4/lib/replace/replace.c
+++ b/source4/lib/replace/replace.c
@@ -154,33 +154,6 @@ time_t rep_mktime(struct tm *t)
#endif /* !HAVE_MKTIME */
-#ifndef HAVE_INNETGR
-#if defined(HAVE_SETNETGRENT) && defined(HAVE_GETNETGRENT) && defined(HAVE_ENDNETGRENT)
-/*
- * Search for a match in a netgroup. This replaces it on broken systems.
- */
-int rep_innetgr(const char *group, const char *host, const char *user,
- const char *dom)
-{
- char *hst, *usr, *dm;
-
- setnetgrent(group);
- while (getnetgrent(&hst, &usr, &dm)) {
- if (((host == 0) || (hst == 0) || !strcmp(host, hst)) &&
- ((user == 0) || (usr == 0) || !strcmp(user, usr)) &&
- ((dom == 0) || (dm == 0) || !strcmp(dom, dm))) {
- endnetgrent();
- return (1);
- }
- }
- endnetgrent();
- return (0);
-}
-#endif /* HAVE_SETNETGRENT HAVE_GETNETGRENT HAVE_ENDNETGRENT */
-#endif /* HAVE_INNETGR */
-
-
-
#ifndef HAVE_INITGROUPS
/****************************************************************************
some systems don't have an initgroups call
diff --git a/source4/lib/replace/test/testsuite.c b/source4/lib/replace/test/testsuite.c
index 5ed6b3e7a5..40ee0650b0 100644
--- a/source4/lib/replace/test/testsuite.c
+++ b/source4/lib/replace/test/testsuite.c
@@ -125,12 +125,6 @@ static int test_mktime(void)
return true;
}
-static int test_innetgr(void)
-{
- /* FIXME */
- return true;
-}
-
static int test_initgroups(void)
{
/* FIXME */
@@ -480,7 +474,6 @@ bool torture_local_replace(struct torture_context *ctx)
ret &= test_strlcpy();
ret &= test_strlcat();
ret &= test_mktime();
- ret &= test_innetgr();
ret &= test_initgroups();
ret &= test_memmove();
ret &= test_strdup();