From 6490a0b6c1af25e91348e8f656d4b5993eb5355f Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Thu, 28 Dec 2006 16:33:36 +0000 Subject: [PATCH] move slapo-{denyop,lastmod} to contrib/slapd-modules/{denyop,lastlog}/ (ITS#4701) --- configure | 108 +++++-------------------------------------- configure.in | 30 ------------ include/portable.hin | 6 --- 3 files changed, 12 insertions(+), 132 deletions(-) diff --git a/configure b/configure index 9f262b2c9f..0f6fcbb4f1 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.639 2006/10/11 10:36:54 kurt Exp . +# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.640 2006/11/06 23:38:19 ando Exp . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -1049,10 +1049,8 @@ SLAPD Overlay Options: --enable-auditlog Audit Logging overlay no|yes|mod [no] --enable-constraint Attribute Constraint overlay no|yes|mod [no] --enable-dds Dynamic Directory Services overlay no|yes|mod [no] - --enable-denyop Deny Operation overlay no|yes|mod [no] --enable-dyngroup Dynamic Group overlay no|yes|mod [no] --enable-dynlist Dynamic List overlay no|yes|mod [no] - --enable-lastmod Last Modification overlay no|yes|mod [no] --enable-ppolicy Password Policy overlay no|yes|mod [no] --enable-proxycache Proxy Cache overlay no|yes|mod [no] --enable-refint Referential Integrity overlay no|yes|mod [no] @@ -3101,10 +3099,8 @@ Overlays="accesslog \ auditlog \ constraint \ dds \ - denyop \ dyngroup \ dynlist \ - lastmod \ ppolicy \ proxycache \ refint \ @@ -3239,30 +3235,6 @@ else fi; # end --enable-dds -# OpenLDAP --enable-denyop - - # Check whether --enable-denyop or --disable-denyop was given. -if test "${enable_denyop+set}" = set; then - enableval="$enable_denyop" - - ol_arg=invalid - for ol_val in no yes mod ; do - if test "$enableval" = "$ol_val" ; then - ol_arg="$ol_val" - fi - done - if test "$ol_arg" = "invalid" ; then - { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-denyop" >&5 -echo "$as_me: error: bad value $enableval for --enable-denyop" >&2;} - { (exit 1); exit 1; }; } - fi - ol_enable_denyop="$ol_arg" - -else - ol_enable_denyop=${ol_enable_overlays:-no} -fi; -# end --enable-denyop - # OpenLDAP --enable-dyngroup # Check whether --enable-dyngroup or --disable-dyngroup was given. @@ -3311,30 +3283,6 @@ else fi; # end --enable-dynlist -# OpenLDAP --enable-lastmod - - # Check whether --enable-lastmod or --disable-lastmod was given. -if test "${enable_lastmod+set}" = set; then - enableval="$enable_lastmod" - - ol_arg=invalid - for ol_val in no yes mod ; do - if test "$enableval" = "$ol_val" ; then - ol_arg="$ol_val" - fi - done - if test "$ol_arg" = "invalid" ; then - { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-lastmod" >&5 -echo "$as_me: error: bad value $enableval for --enable-lastmod" >&2;} - { (exit 1); exit 1; }; } - fi - ol_enable_lastmod="$ol_arg" - -else - ol_enable_lastmod=${ol_enable_overlays:-no} -fi; -# end --enable-lastmod - # OpenLDAP --enable-ppolicy # Check whether --enable-ppolicy or --disable-ppolicy was given. @@ -5686,7 +5634,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5689 "configure"' > conftest.$ac_ext + echo '#line 5637 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7666,11 +7614,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7669: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7617: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7673: \$? = $ac_status" >&5 + echo "$as_me:7621: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7928,11 +7876,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7931: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7879: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7935: \$? = $ac_status" >&5 + echo "$as_me:7883: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7990,11 +7938,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7993: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7941: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7997: \$? = $ac_status" >&5 + echo "$as_me:7945: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10238,7 +10186,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <>conftest.$ac_ext <<_ACEOF # define DB_VERSION_MINOR 0 #endif -/* require 4.2 or later */ -#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2) +/* require 4.2 or later, but exclude 4.3 */ +#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2) && (DB_VERSION_MINOR !=3) __db_version_compat #endif @@ -40549,22 +40497,6 @@ _ACEOF fi -if test "$ol_enable_denyop" != no ; then - BUILD_DENYOP=$ol_enable_denyop - if test "$ol_enable_denyop" = mod ; then - MFLAG=SLAPD_MOD_DYNAMIC - SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS denyop.la" - else - MFLAG=SLAPD_MOD_STATIC - SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS denyop.o" - fi - -cat >>confdefs.h <<_ACEOF -#define SLAPD_OVER_DENYOP $MFLAG -_ACEOF - -fi - if test "$ol_enable_dyngroup" != no ; then BUILD_DYNGROUP=$ol_enable_dyngroup if test "$ol_enable_dyngroup" = mod ; then @@ -40597,22 +40529,6 @@ _ACEOF fi -if test "$ol_enable_lastmod" != no ; then - BUILD_LASTMOD=$ol_enable_lastmod - if test "$ol_enable_lastmod" = mod ; then - MFLAG=SLAPD_MOD_DYNAMIC - SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS lastmod.la" - else - MFLAG=SLAPD_MOD_STATIC - SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS lastmod.o" - fi - -cat >>confdefs.h <<_ACEOF -#define SLAPD_OVER_LASTMOD $MFLAG -_ACEOF - -fi - if test "$ol_enable_ppolicy" != no ; then BUILD_PPOLICY=$ol_enable_ppolicy if test "$ol_enable_ppolicy" = mod ; then diff --git a/configure.in b/configure.in index be2f5e9043..7377602ad4 100644 --- a/configure.in +++ b/configure.in @@ -331,10 +331,8 @@ Overlays="accesslog \ auditlog \ constraint \ dds \ - denyop \ dyngroup \ dynlist \ - lastmod \ ppolicy \ proxycache \ refint \ @@ -359,14 +357,10 @@ OL_ARG_ENABLE(constraint,[ --enable-constraint Attribute Constraint overlay no, [no yes mod], ol_enable_overlays) OL_ARG_ENABLE(dds,[ --enable-dds Dynamic Directory Services overlay], no, [no yes mod], ol_enable_overlays) -OL_ARG_ENABLE(denyop,[ --enable-denyop Deny Operation overlay], - no, [no yes mod], ol_enable_overlays) OL_ARG_ENABLE(dyngroup,[ --enable-dyngroup Dynamic Group overlay], no, [no yes mod], ol_enable_overlays) OL_ARG_ENABLE(dynlist,[ --enable-dynlist Dynamic List overlay], no, [no yes mod], ol_enable_overlays) -OL_ARG_ENABLE(lastmod,[ --enable-lastmod Last Modification overlay], - no, [no yes mod], ol_enable_overlays) OL_ARG_ENABLE(ppolicy,[ --enable-ppolicy Password Policy overlay], no, [no yes mod], ol_enable_overlays) OL_ARG_ENABLE(proxycache,[ --enable-proxycache Proxy Cache overlay], @@ -2816,18 +2810,6 @@ if test "$ol_enable_dds" != no ; then AC_DEFINE_UNQUOTED(SLAPD_OVER_DDS,$MFLAG,[define for Dynamic Directory Services overlay]) fi -if test "$ol_enable_denyop" != no ; then - BUILD_DENYOP=$ol_enable_denyop - if test "$ol_enable_denyop" = mod ; then - MFLAG=SLAPD_MOD_DYNAMIC - SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS denyop.la" - else - MFLAG=SLAPD_MOD_STATIC - SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS denyop.o" - fi - AC_DEFINE_UNQUOTED(SLAPD_OVER_DENYOP,$MFLAG,[define for Deny Operation overlay]) -fi - if test "$ol_enable_dyngroup" != no ; then BUILD_DYNGROUP=$ol_enable_dyngroup if test "$ol_enable_dyngroup" = mod ; then @@ -2852,18 +2834,6 @@ if test "$ol_enable_dynlist" != no ; then AC_DEFINE_UNQUOTED(SLAPD_OVER_DYNLIST,$MFLAG,[define for Dynamic List overlay]) fi -if test "$ol_enable_lastmod" != no ; then - BUILD_LASTMOD=$ol_enable_lastmod - if test "$ol_enable_lastmod" = mod ; then - MFLAG=SLAPD_MOD_DYNAMIC - SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS lastmod.la" - else - MFLAG=SLAPD_MOD_STATIC - SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS lastmod.o" - fi - AC_DEFINE_UNQUOTED(SLAPD_OVER_LASTMOD,$MFLAG,[define for Last Modification overlay]) -fi - if test "$ol_enable_ppolicy" != no ; then BUILD_PPOLICY=$ol_enable_ppolicy if test "$ol_enable_ppolicy" = mod ; then diff --git a/include/portable.hin b/include/portable.hin index ba3be72eb1..072d945ef0 100644 --- a/include/portable.hin +++ b/include/portable.hin @@ -972,18 +972,12 @@ /* define for Dynamic Directory Services overlay */ #undef SLAPD_OVER_DDS -/* define for Deny Operation overlay */ -#undef SLAPD_OVER_DENYOP - /* define for Dynamic Group overlay */ #undef SLAPD_OVER_DYNGROUP /* define for Dynamic List overlay */ #undef SLAPD_OVER_DYNLIST -/* define for Last Modification overlay */ -#undef SLAPD_OVER_LASTMOD - /* define for Password Policy overlay */ #undef SLAPD_OVER_PPOLICY -- 2.39.5