mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
r22151: 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 7f61b3f009
)
This commit is contained in:
parent
1790c67780
commit
1ec9de1104
@ -12,7 +12,6 @@ strlcpy
|
||||
strlcat
|
||||
mktime
|
||||
rename
|
||||
innetgr
|
||||
initgroups
|
||||
memmove
|
||||
strdup
|
||||
@ -88,5 +87,4 @@ stdbool.h
|
||||
Prerequisites:
|
||||
memset (for bzero)
|
||||
syslog (for vsyslog)
|
||||
setnetgrent, getnetgrent, endnetgrent (for innetgr)
|
||||
mktemp (for mkstemp and mkdtemp)
|
||||
|
@ -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>])
|
||||
@ -330,8 +330,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
|
||||
|
@ -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
|
||||
|
@ -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 */
|
||||
@ -426,7 +420,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();
|
||||
|
Loading…
Reference in New Issue
Block a user