From 99a7b2d24fb46d9d8304e4f0865b43fc5e13a9bf Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 18 Mar 2005 00:16:02 +0000 Subject: [PATCH] Misc updates --- ANNOUNCEMENT | 4 ++- configure | 58 +++++++++++++++++++++++++++++++++++-------- include/portable.h.in | 3 +++ servers/slapd/index.c | 1 + servers/slapd/slap.h | 2 -- 5 files changed, 55 insertions(+), 13 deletions(-) diff --git a/ANNOUNCEMENT b/ANNOUNCEMENT index 9718ca5c93..eaa23b17f6 100644 --- 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 4733a0030c..45dc37087f 100755 --- 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 . # @@ -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 < +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 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 " 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 <&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 4e7401b1df..2f3ba70348 100644 --- 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 f4590ccf83..a076be5ea1 100644 --- a/servers/slapd/index.c +++ b/servers/slapd/index.c @@ -18,6 +18,7 @@ #include #include +#include #include "slap.h" diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index da0d71040e..a709984936 100644 --- 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 { -- 2.39.2