Misc updates

diff --git a/ANNOUNCEMENT b/ANNOUNCEMENT
index 9718ca5c93a054cb7c3b104ebd4009bbaf56a591..eaa23b17f627afc745bc40bb770267b51ec0a9fa 100644 (file)
--- a/ANNOUNCEMENT
+++ b/ANNOUNCEMENT
@@ -5,13 +5,15 @@ A N N O U N C E M E N T -- OpenLDAP 2.3
     Access Protocol (v3) servers, clients, utilities, and
     development tools.
 
-    This alpha release contains the following major enhancements:
+    This beta release contains the following major enhancements:
 
         * Slapd(8) enhancements
                        - Updated slapd "overlay" interface, and numberous
                          example (and mostly experimental) overlays.
             - Updated LDAP "sync" Engine with replication support,
                          provider now an "overlay"
+                       - Numerous access control enhancments, including
+              expimental "don't disclose on error" capability
         * LDAPv3 extensions, including:
                        - LDAP Component Matching (requires OpenLDAP snacc)
                        - LDAP Modify Increment

diff --git a/configure b/configure
index 4733a0030ca1dc595c2c098448287b085112ab98..45dc37087f33a40249396c8f650c7326a96dbe1e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.568 2005/03/10 03:35:59 hyc Exp  
+# from OpenLDAP: pkg/ldap/configure.in,v 1.560.2.4 2005/03/17 22:51:27 kurt Exp  
 
 # This work is part of OpenLDAP Software <http://www.openldap.org/>.
 #
@@ -95,7 +95,7 @@ ac_help="$ac_help
 ac_help="$ac_help
     --enable-dnssrv      enable dnssrv backend no|yes|mod [no]"
 ac_help="$ac_help
-    --enable-hdb         enable Hierarchical DB backend no|yes|mod [no]"
+    --enable-hdb         enable Hierarchical DB backend no|yes|mod [yes]"
 ac_help="$ac_help
     --enable-ldap        enable ldap backend no|yes|mod [no]"
 ac_help="$ac_help
@@ -1993,7 +1993,7 @@ if test "${enable_hdb+set}" = set; then
        ol_enable_hdb="$ol_arg"
 
 else
-       ol_enable_hdb="no"
+       ol_enable_hdb="yes"
 fi
 # end --enable-hdb
 # OpenLDAP --enable-ldap
@@ -2825,7 +2825,7 @@ SLAPD_DYNAMIC_OVERLAYS=
 SLAPD_MODULES_LDFLAGS=
 SLAPD_MODULES_CPPFLAGS=
 
-SLAPD_STATIC_BACKENDS=
+SLAPD_STATIC_BACKENDS=back-ldif
 SLAPD_DYNAMIC_BACKENDS=
 
 SLAPD_PERL_LDFLAGS=
@@ -24732,6 +24732,42 @@ EOF
 
   fi
 
+       if test "$ac_cv_func_getpeereid" != yes; then
+               echo $ac_n "checking for msg_control in msghdr""... $ac_c" 1>&6
+echo "configure:24738: checking for msg_control in msghdr" >&5
+if eval "test \"\${ol_cv_msghdr_msg_control+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 24743 "configure"
+#include "confdefs.h"
+#include <sys/socket.h>
+int main() {
+struct msghdr m; m.msg_control=(struct cmsghdr *)0
+; return 0; }
+EOF
+if { (eval echo configure:24750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ol_cv_msghdr_msg_control=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ol_cv_msghdr_msg_control=no
+fi
+rm -f conftest*
+       
+fi
+
+echo "$ac_t""$ol_cv_msghdr_msg_control" 1>&6
+  if test $ol_cv_msghdr_msg_control = "yes" ; then
+       cat >> confdefs.h <<\EOF
+#define HAVE_MSGHDR_MSG_CONTROL 1
+EOF
+
+  fi
+
+       fi
        LIBSRCS="$LIBSRCS getpeereid.c"
 fi
 if test "$ac_cv_func_snprintf" != yes -o "$ac_cv_func_vsnprintf" != yes; then
@@ -24755,17 +24791,17 @@ if test "$ol_enable_slapi" != no ; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:24759: checking for $ac_hdr" >&5
+echo "configure:24795: checking for $ac_hdr" >&5
 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 24764 "configure"
+#line 24800 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:24769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:24805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -24796,7 +24832,7 @@ done
                { echo "configure: error: could not locate <ltdl.h>" 1>&2; exit 1; }
        fi
        echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6
-echo "configure:24800: checking for lt_dlinit in -lltdl" >&5
+echo "configure:24836: checking for lt_dlinit in -lltdl" >&5
 ac_lib_var=`echo ltdl'_'lt_dlinit | sed 'y%./+-:%__p__%'`
 if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -24804,7 +24840,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lltdl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 24808 "configure"
+#line 24844 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -24815,7 +24851,7 @@ int main() {
 lt_dlinit()
 ; return 0; }
 EOF
-if { (eval echo configure:24819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:24855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -25508,6 +25544,7 @@ servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefi
 servers/slapd/back-hdb/Makefile:build/top.mk:servers/slapd/back-hdb/Makefile.in:build/mod.mk \
 servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk \
 servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \
+servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk \
 servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk \
 servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk \
 servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk \
@@ -25739,6 +25776,7 @@ servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefi
 servers/slapd/back-hdb/Makefile:build/top.mk:servers/slapd/back-hdb/Makefile.in:build/mod.mk \
 servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk \
 servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \
+servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk \
 servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk \
 servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk \
 servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk \

diff --git a/include/portable.h.in b/include/portable.h.in
index 4e7401b1dfd4525baf1add47caaa10aaa2d5bbc2..2f3ba70348014107c02afbabfec4750ef54d5ebc 100644 (file)
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -944,6 +944,9 @@
 /* define if struct msghdr has msg_accrights */
 #undef HAVE_MSGHDR_MSG_ACCRIGHTS
 
+/* define if struct msghdr has msg_control */
+#undef HAVE_MSGHDR_MSG_CONTROL
+
 /* define to snprintf routine */
 #undef snprintf
 

diff --git a/servers/slapd/index.c b/servers/slapd/index.c
index f4590ccf83acd35e45e6ee201ccfd990436571d8..a076be5ea1d1c30aae3ce5c4620a2ec673f85db9 100644 (file)
--- a/servers/slapd/index.c
+++ b/servers/slapd/index.c
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 #include <ac/string.h>
+#include <lutil.h>
 
 #include "slap.h"
 

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index da0d71040eba205be8ed9e0ac157e3a79e43efd2..a7099849360b932962196edcd4ef6bc62f666243 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -906,9 +906,7 @@ struct slap_internal_schema {
 typedef struct slap_attr_assertion {
        AttributeDescription    *aa_desc;
        struct berval aa_value;
-#ifdef LDAP_COMP_MATCH
        struct slap_component_filter *aa_cf;/* for attribute aliasing */
-#endif
 } AttributeAssertion;
 
 typedef struct slap_ss_assertion {