From b90245c3a37d9211920877a9587fe753f4297dba Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 30 Sep 2002 17:43:05 +0000 Subject: [PATCH] Disable suffixAlias support. Needs much work. --- CHANGES | 3 ++- doc/man/man5/slapd.conf.5 | 2 ++ servers/slapd/config.c | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 7fb6b76196..333ffb288a 100644 --- a/CHANGES +++ b/CHANGES @@ -3,9 +3,10 @@ OpenLDAP 2.1 Change Log OpenLDAP 2.1.6 Engineering Fixed slapd unsupported non-critical control handling Fixed slapd value_find() uninitialized variable bug (ITS#2097) - Fixed back-dnssrv default referral handling + Fixed back-dnssrv default referral handling (ITS#2116) Updated libldap_r Pth support (ITS#724) (ITS#1033) Updated slapd adlist support + Disable suffixAlias feature Build Environment Fixed back-bdb module linking problem Updated pthreads detection diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index 3a9bb9836a..49ccb75632 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -989,6 +989,8 @@ with the inner suffix must come first in the configuration file. Specify an alternate suffix that may be used to reference an already defined database suffix. Operations specifying DNs residing under the alias will execute as if they had specified the aliased suffix. +.I This feature is no supported in this version of +.BI slapd (8). .TP .B subordinate Specify that the current backend database is a subordinate of another diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 5a58e83baf..6c66180bff 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -903,6 +903,20 @@ read_config( const char *fname, int depth ) struct berval alias, palias, nalias; struct berval aliased, paliased, naliased; + if( 1 ) { +#ifdef NEW_LOGGING + LDAP_LOG( CONFIG, CRIT, + "%s: line %d: suffixAlias is no longer supported.\n" + fname, lineno, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "%s: line %d: suffixAlias is no longer supported.\n" + fname, lineno, 0 ); +#endif + + return( 1 ); + } + if ( cargc < 2 ) { #ifdef NEW_LOGGING LDAP_LOG( CONFIG, CRIT, -- 2.39.2