From fc9e20763f868b59e74a9aac8e59692d0ac188ce Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 27 Dec 1998 20:57:30 +0000 Subject: [PATCH] Only use the LDAP_ALLOW_NULL_SEARCH_BASE code as last resort. Moved to after other suffix checks. --- servers/slapd/backend.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c index 45ce3150d8..2593616328 100644 --- a/servers/slapd/backend.c +++ b/servers/slapd/backend.c @@ -128,18 +128,6 @@ select_backend( char * dn ) for ( j = 0; backends[i].be_suffix != NULL && backends[i].be_suffix[j] != NULL; j++ ) { -#ifdef LDAP_ALLOW_NULL_SEARCH_BASE - /* Add greg@greg.rim.or.jp - * It's quick hack for cheap client - * Some browser offer a NULL base at ldap_search - */ - if(dnlen == 0) { - Debug( LDAP_DEBUG_TRACE, - "select_backend: use default backend\n", 0, 0, 0 ); - return (&backends[i]); - } -#endif /* LDAP_ALLOW_NULL_SEARCH_BASE */ - len = strlen( backends[i].be_suffix[j] ); if ( len > dnlen ) { @@ -173,6 +161,19 @@ select_backend( char * dn ) } } +#ifdef LDAP_ALLOW_NULL_SEARCH_BASE + /* Add greg@greg.rim.or.jp + * It's quick hack for cheap client + * Some browser offer a NULL base at ldap_search + * + * Should only be used as a last resort. -Kdz + */ + if(dnlen == 0) { + Debug( LDAP_DEBUG_TRACE, + "select_backend: use default backend\n", 0, 0, 0 ); + return( &backends[0] ); + } +#endif /* LDAP_ALLOW_NULL_SEARCH_BASE */ return( NULL ); } -- 2.39.5