sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

r22152: merge from samba3:

Browse Source 
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 dd83a8dad8)
This commit is contained in:
Stefan Metzmacher 2007-04-10 16:00:13 +00:00 committed by Gerald (Jerry) Carter
parent 892c8cd1b4
commit 4cc500433d
4 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/lib/replace/README
View File

@ -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)

5
source4/lib/replace/libreplace.m4
View File

@ -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

27
source4/lib/replace/replace.c
View File

@ -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

7
source4/lib/replace/test/testsuite.c
View File

@ -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();