[Pkg-shadow-commits] r2296 - in upstream/trunk: . lib
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Sat Aug 30 18:30:36 UTC 2008
Author: nekral-guest
Date: 2008-08-30 18:30:36 +0000 (Sat, 30 Aug 2008)
New Revision: 2296
Modified:
upstream/trunk/ChangeLog
upstream/trunk/configure.in
upstream/trunk/lib/nscd.c
upstream/trunk/lib/nscd.h
Log:
* configure.in, lib/nscd.h, lib/nscd.c: Added --with-nscd flag to
support systems without nscd.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2008-08-30 18:30:15 UTC (rev 2295)
+++ upstream/trunk/ChangeLog 2008-08-30 18:30:36 UTC (rev 2296)
@@ -5,6 +5,8 @@
standard. Check if they are implemented before using them. Do not
set the time of links if lutimes() does not exist, and use
utimes() as a replacement for futimes().
+ * configure.in, lib/nscd.h, lib/nscd.c: Added --with-nscd flag to
+ support systems without nscd.
2008-08-26 Nicolas François <nicolas.francois at centraliens.net>
Modified: upstream/trunk/configure.in
===================================================================
--- upstream/trunk/configure.in 2008-08-30 18:30:15 UTC (rev 2295)
+++ upstream/trunk/configure.in 2008-08-30 18:30:36 UTC (rev 2296)
@@ -38,9 +38,9 @@
dnl shadow now uses the libc's shadow implementation
AC_CHECK_HEADER([shadow.h],,[AC_MSG_ERROR([You need a libc with shadow.h])])
-AC_CHECK_FUNCS(l64a fchmod fchown fsync getgroups gethostname getspnam \
+AC_CHECK_FUNCS(l64a fchmod fchown fsync futimes getgroups gethostname getspnam \
gettimeofday getusershell getutent initgroups lchown lckpwdf lstat \
- memcpy memset setgroups sigaction strchr updwtmp updwtmpx innetgr \
+ lutimes memcpy memset setgroups sigaction strchr updwtmp updwtmpx innetgr \
getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
AC_SYS_LARGEFILE
@@ -235,12 +235,20 @@
AC_ARG_WITH(sha-crypt,
[AC_HELP_STRING([--with-sha-crypt], [allow the SHA256 and SHA512 password encryption algorithms @<:@default=yes@:>@])],
[with_sha_crypt=$withval], [with_sha_crypt=yes])
+AC_ARG_WITH(nscd,
+ [AC_HELP_STRING([--with-nscd], [enable support for nscd @<:@default=yes@:>@])],
+ [with_nscd=$withval], [with_nscd=yes])
AM_CONDITIONAL(USE_SHA_CRYPT, test "x$with_sha_crypt" = "xyes")
if test "$with_sha_crypt" = "yes"; then
AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms])
fi
+AM_CONDITIONAL(USE_NSCD, test "x$with_nscd" = "xyes")
+if test "$with_nscd" = "yes"; then
+ AC_DEFINE(USE_NSCD, 1, [Define to support flushing of nscd caches])
+fi
+
dnl Check for some functions in libc first, only if not found check for
dnl other libraries. This should prevent linking libnsl if not really
dnl needed (Linux glibc, Irix), but still link it if needed (Solaris).
@@ -457,4 +465,5 @@
echo " shadow group support: $enable_shadowgrp"
echo " S/Key support: $with_skey"
echo " SHA passwords encryption: $with_sha_crypt"
+echo " nscd support: $with_nscd"
echo
Modified: upstream/trunk/lib/nscd.c
===================================================================
--- upstream/trunk/lib/nscd.c 2008-08-30 18:30:15 UTC (rev 2295)
+++ upstream/trunk/lib/nscd.c 2008-08-30 18:30:36 UTC (rev 2296)
@@ -1,5 +1,8 @@
/* Author: Peter Vrabec <pvrabec at redhat.com> */
+#include <config.h>
+#ifdef USE_NSCD
+
/* because of TEMP_FAILURE_RETRY */
#define _GNU_SOURCE
@@ -54,4 +57,5 @@
return 0;
}
+#endif
Modified: upstream/trunk/lib/nscd.h
===================================================================
--- upstream/trunk/lib/nscd.h 2008-08-30 18:30:15 UTC (rev 2295)
+++ upstream/trunk/lib/nscd.h 2008-08-30 18:30:36 UTC (rev 2296)
@@ -4,6 +4,10 @@
/*
* nscd_flush_cache - flush specified service buffer in nscd cache
*/
+#ifdef USE_NSCD
extern int nscd_flush_cache (const char *service);
+#else
+#define nscd_flush_cache(service) (0)
+#endif
#endif
More information about the Pkg-shadow-commits
mailing list