Solaris9 build fixes:

	* amd/info_ldap.c (amu_ldap_rebind): call ldap_enable_cache() only
	if configure detected it

	* configure.in: check for ldap_enable_cache()

diff --git a/ChangeLog b/ChangeLog
index 7334a08ef52805b3a1b1d4282db00b2675f17998..69ff133ed27fd39d4f6322371d1aa4c497954765 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-11  Ion Badulescu  <ionut@moisil.badula.org>
+
+       Solaris9 build fixes:
+
+       * amd/info_ldap.c (amu_ldap_rebind): call ldap_enable_cache() only
+       if configure detected it
+
+       * configure.in: check for ldap_enable_cache()
+
 2002-12-10  Erez Zadok  <ezk@localhost.localdomain>
 
        * rename "aux/" subdir into "m4/" so as to avoid problems with

diff --git a/NEWS b/NEWS
index 9d220fc0951c07987ace2d20208d90e715921052..77e990a640ad003e5c9e7ca7e5caee447f663a93 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 # -*- text -*-
 
+*** Notes specific to am-utils version 6.0.9-pre:
+
+- Minor new ports:
+       sparc-sun-solaris2.9
+
 *** Notes specific to am-utils version 6.0.8:
 
 - Minor new ports:

diff --git a/amd/info_ldap.c b/amd/info_ldap.c
index c3779695f41e5e02cf6af2f930cc958dfce8eeb1..1f84764b244dd1daa4ac4eac41535cc503c3d901 100644 (file)
--- a/amd/info_ldap.c
+++ b/amd/info_ldap.c
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: info_ldap.c,v 1.9.2.5 2002/03/28 21:23:13 ezk Exp $
+ * $Id: info_ldap.c,v 1.9.2.6 2002/12/11 06:11:17 ib42 Exp $
  *
  */
 
@@ -264,7 +264,11 @@ amu_ldap_rebind(ALD *a)
        break;
       }
       if (gopt.ldap_cache_seconds > 0) {
+#ifdef HAVE_LDAP_ENABLE_CACHE
        ldap_enable_cache(ld, gopt.ldap_cache_seconds, gopt.ldap_cache_maxmem);
+#else /* HAVE_LDAP_ENABLE_CACHE */
+       plog(XLOG_WARNING, "ldap_enable_cache(%ld) does not exist on this system!\n", gopt.ldap_cache_seconds);
+#endif /* HAVE_LDAP_ENABLE_CACHE */
        a->ldap = ld;
        a->timestamp = now;
        return (0);

diff --git a/configure.in b/configure.in
index 27b1a5e144ba62b9616a18996b84d0f9da1098fb..32e344adf70fe26eda70d0bf6bcd537ca0834341 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -53,7 +53,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.1.2.32 $)
+AC_REVISION($Revision: 1.1.2.33 $)
 AC_COPYRIGHT([Copyright (c) 1997-2002 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)
@@ -286,6 +286,7 @@ AC_CHECK_FUNCS(                     \
        hesiod_reload           \
        hesiod_to_bind          \
        ldap_open               \
+       ldap_enable_cache       \
        memcmp                  \
        memcpy                  \
        memmove                 \