From 9b604802931ec38ed8a036389cc1ae69dfecac44 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sun, 19 Jun 2005 22:43:00 +0000 Subject: [PATCH] add support for retcode overlay (configure needs be regenerated) --- configure.in | 18 +++++++++++++++++- include/portable.h.in | 3 +++ tests/run.in | 3 ++- tests/scripts/conf.sh | 35 ++++++++++++++++++----------------- tests/scripts/defines.sh | 3 +++ 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/configure.in b/configure.in index 1755722d87..eb1f52fb7c 100644 --- a/configure.in +++ b/configure.in @@ -243,7 +243,7 @@ OL_ARG_ENABLE(sql,[ --enable-sql enable sql backend no|yes|mod], dnl ---------------------------------------------------------------- dnl SLAPD Overlay Options Overlays="accesslog denyop dyngroup dynlist glue lastmod ppolicy proxycache \ - refint rwm syncprov translucent unique" + refint retcode rwm syncprov translucent unique" AC_ARG_WITH(xxslapoverlays,[ SLAPD Overlay Options:]) @@ -268,6 +268,8 @@ OL_ARG_ENABLE(proxycache,[ --enable-proxycache Proxy Cache overlay no|yes|m no, [no yes mod]) OL_ARG_ENABLE(refint,[ --enable-refint Referential Integrity overlay no|yes|mod], no, [no yes mod]) +OL_ARG_ENABLE(retcode,[ --enable-retcode Return Code testing overlay no|yes|mod], + no, [no yes mod]) OL_ARG_ENABLE(rwm,[ --enable-rwm Rewrite/Remap overlay no|yes|mod], no, [no yes mod]) OL_ARG_ENABLE(syncprov,[ --enable-syncprov Syncrepl Provider overlay no|yes|mod], @@ -533,6 +535,7 @@ BUILD_LASTMOD=no BUILD_PPOLICY=no BUILD_PROXYCACHE=no BUILD_REFINT=no +BUILD_RETCODE=no BUILD_RWM=no BUILD_SYNCPROV=no BUILD_TRANSLUCENT=no @@ -2877,6 +2880,18 @@ if test "$ol_enable_refint" != no ; then AC_DEFINE_UNQUOTED(SLAPD_OVER_REFINT,$MFLAG,[define for Referential Integrity overlay]) fi +if test "$ol_enable_retcode" != no ; then + BUILD_RETCODE=$ol_enable_retcode + if test "$ol_enable_retcode" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS retcode.la" + else + MFLAG=SLAPD_MOD_STATIC + SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS retcode.o" + fi + AC_DEFINE_UNQUOTED(SLAPD_OVER_RETCODE,$MFLAG,[define for Referential Integrity overlay]) +fi + if test "$ol_enable_rwm" != no ; then BUILD_REWRITE=yes BUILD_RWM=$ol_enable_rwm @@ -2991,6 +3006,7 @@ dnl overlays AC_SUBST(BUILD_PPOLICY) AC_SUBST(BUILD_PROXYCACHE) AC_SUBST(BUILD_REFINT) + AC_SUBST(BUILD_RETCODE) AC_SUBST(BUILD_RWM) AC_SUBST(BUILD_SYNCPROV) AC_SUBST(BUILD_TRANSLUCENT) diff --git a/include/portable.h.in b/include/portable.h.in index 9fb57e6f93..516d9cc3f5 100644 --- a/include/portable.h.in +++ b/include/portable.h.in @@ -1061,6 +1061,9 @@ /* define for Referential Integrity overlay */ #undef SLAPD_OVER_REFINT +/* define for Return Code testing overlay */ +#undef SLAPD_OVER_RETCODE + /* define for Rewrite/Remap overlay */ #undef SLAPD_OVER_RWM diff --git a/tests/run.in b/tests/run.in index 57adb1c587..f4a46d47ce 100644 --- a/tests/run.in +++ b/tests/run.in @@ -37,6 +37,7 @@ AC_glue=glue@BUILD_GLUE@ AC_pcache=pcache@BUILD_PROXYCACHE@ AC_ppolicy=ppolicy@BUILD_PPOLICY@ AC_refint=refint@BUILD_REFINT@ +AC_retcode=retcode@BUILD_RETCODE@ AC_translucent=translucent@BUILD_TRANSLUCENT@ AC_unique=unique@BUILD_UNIQUE@ AC_rwm=rwm@BUILD_RWM@ @@ -48,7 +49,7 @@ AC_WITH_TLS=@WITH_TLS@ AC_WITH_MODULES_ENABLED=@WITH_MODULES_ENABLED@ export AC_bdb AC_hdb AC_ldap AC_ldbm AC_meta AC_monitor AC_relay AC_sql -export AC_glue AC_pcache AC_ppolicy AC_refint AC_unique AC_rwm AC_syncprov +export AC_glue AC_pcache AC_ppolicy AC_refint AC_retcode AC_rwm AC_unique AC_syncprov export AC_translucent AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED if test ! -x ../servers/slapd/slapd ; then diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh index 06cbe31205..2eb536b29b 100755 --- a/tests/scripts/conf.sh +++ b/tests/scripts/conf.sh @@ -35,36 +35,37 @@ fi sed -e "s/@BACKEND@/${BACKEND}/" \ -e "s/^#${BACKEND}#//" \ -e "s/@RELAY@/${RELAY}/" \ - -e "s/^#relay-${RELAY}#//" \ + -e "s/^#relay-${RELAY}#//" \ -e "s/^#${BACKENDTYPE}#//" \ - -e "s/^#${AC_glue}#//" \ -e "s/^#${AC_ldap}#//" \ -e "s/^#${AC_meta}#//" \ -e "s/^#${AC_relay}#//" \ -e "s/^#${AC_sql}#//" \ -e "s/^#${RDBMS}#//" \ + -e "s/^#${AC_glue}#//" \ -e "s/^#${AC_pcache}#//" \ -e "s/^#${AC_ppolicy}#//" \ -e "s/^#${AC_refint}#//" \ + -e "s/^#${AC_retcode}#//" \ + -e "s/^#${AC_rwm}#//" \ -e "s/^#${AC_syncprov}#//" \ - -e "s/^#${AC_translucent}#//" \ + -e "s/^#${AC_translucent}#//" \ -e "s/^#${AC_unique}#//" \ - -e "s/^#${AC_rwm}#//" \ -e "s/^#${MON}#//" \ -e "s/^#${MONMOD}#//" \ -e "s/^#${SASL}#//" \ - -e "s;@URI1@;${URI1};" \ - -e "s;@URI2@;${URI2};" \ - -e "s;@URI3@;${URI3};" \ - -e "s;@URI4@;${URI4};" \ - -e "s;@URI5@;${URI5};" \ - -e "s;@URI6@;${URI6};" \ - -e "s;@PORT1@;${PORT1};" \ - -e "s;@PORT2@;${PORT2};" \ - -e "s;@PORT3@;${PORT3};" \ - -e "s;@PORT4@;${PORT4};" \ - -e "s;@PORT5@;${PORT5};" \ - -e "s;@PORT6@;${PORT6};" \ - -e "s/@SASL_MECH@/${SASL_MECH}/" \ + -e "s;@URI1@;${URI1};" \ + -e "s;@URI2@;${URI2};" \ + -e "s;@URI3@;${URI3};" \ + -e "s;@URI4@;${URI4};" \ + -e "s;@URI5@;${URI5};" \ + -e "s;@URI6@;${URI6};" \ + -e "s;@PORT1@;${PORT1};" \ + -e "s;@PORT2@;${PORT2};" \ + -e "s;@PORT3@;${PORT3};" \ + -e "s;@PORT4@;${PORT4};" \ + -e "s;@PORT5@;${PORT5};" \ + -e "s;@PORT6@;${PORT6};" \ + -e "s/@SASL_MECH@/${SASL_MECH}/" \ -e "s/@CACHETTL@/${CACHETTL}/" \ -e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/" diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh index 2596181bbf..71c2ef77d4 100755 --- a/tests/scripts/defines.sh +++ b/tests/scripts/defines.sh @@ -24,6 +24,7 @@ GLUE=${AC_glue-glueno} PROXYCACHE=${AC_pcache-pcacheno} PPOLICY=${AC_ppolicy-ppolicyno} REFINT=${AC_refint-refintno} +RETCODE=${AC_retcode-retcodeno} RWM=${AC_rwm-rwmno} TRANSLUCENT=${AC_translucent-translucentno} UNIQUE=${AC_unique-uniqueno} @@ -72,6 +73,7 @@ REFSLAVECONF=$DATADIR/slapd-ref-slave.conf SCHEMACONF=$DATADIR/slapd-schema.conf GLUECONF=$DATADIR/slapd-glue.conf REFINTCONF=$DATADIR/slapd-refint.conf +RETCODECONF=$DATADIR/slapd-retcode.conf UNIQUECONF=$DATADIR/slapd-unique.conf LIMITSCONF=$DATADIR/slapd-limits.conf DNCONF=$DATADIR/slapd-dn.conf @@ -191,6 +193,7 @@ BABSDN="cn=Barbara Jensen,ou=Information Technology DivisioN,OU=People,dc=exampl BJORNSDN="cn=Bjorn Jensen,ou=Information Technology DivisioN,OU=People,dc=example,dc=com" JAJDN="cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com" REFINTDN="cn=Manager,o=refint" +RETCODEDN="ou=RetCodes,$BASEDN" UNIQUEDN="cn=Manager,o=unique" EMPTYDNDN="cn=Manager,c=US" TRANSLUCENTROOT="o=translucent" -- 2.39.5