From 89c84fe8a9274715cc017078f6ee0f937994a696 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Mon, 6 Aug 2007 14:46:51 +0000 Subject: [PATCH] rework ITS#4322 check --- servers/slapd/back-relay/config.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/servers/slapd/back-relay/config.c b/servers/slapd/back-relay/config.c index 502bfae461..db2e3c1550 100644 --- a/servers/slapd/back-relay/config.c +++ b/servers/slapd/back-relay/config.c @@ -48,6 +48,14 @@ relay_back_db_config( int rc; BackendDB *bd; + if ( !BER_BVISNULL( &ri->ri_realsuffix ) ) { + Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, + "%s: line %d: " + "relay dn already specified.\n", + fname, lineno ); + return 1; + } + switch ( argc ) { case 3: if ( strcmp( argv[ 2 ], "massage" ) != 0 ) { @@ -96,14 +104,6 @@ relay_back_db_config( return 1; } - if ( !BER_BVISNULL( &ri->ri_realsuffix ) ) { - Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "%s: line %d: " - "relay dn already specified.\n", - fname, lineno ); - return 1; - } - /* The man page says that the "relay" directive * automatically instantiates slapo-rwm; I don't * like this very much any more, I'd prefer to -- 2.39.5