mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-06 10:46:21 +08:00
don't allow multiple relay lines (ITS#4322)
This commit is contained in:
parent
a9844efa70
commit
de80985c95
@ -31,13 +31,13 @@ relay_back_db_config(
|
||||
const char *fname,
|
||||
int lineno,
|
||||
int argc,
|
||||
char **argv
|
||||
)
|
||||
char **argv )
|
||||
{
|
||||
relay_back_info *ri = (struct relay_back_info *)be->be_private;
|
||||
|
||||
if ( ri == NULL ) {
|
||||
fprintf( stderr, "%s: line %d: relay backend info is null!\n",
|
||||
Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
|
||||
"%s: line %d: relay backend info is null.\n",
|
||||
fname, lineno );
|
||||
return 1;
|
||||
}
|
||||
@ -49,14 +49,23 @@ relay_back_db_config(
|
||||
BackendDB *bd;
|
||||
|
||||
if ( argc < 2 ) {
|
||||
fprintf( stderr,
|
||||
"%s: line %d: missing relay suffix in \"relay <dn> [massage]\" line\n",
|
||||
Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
|
||||
"%s: line %d: missing relay suffix "
|
||||
"in \"relay <dn> [massage]\" line.\n",
|
||||
fname, lineno );
|
||||
return 1;
|
||||
|
||||
} else if ( argc > 3 ) {
|
||||
fprintf( stderr,
|
||||
"%s: line %d: too many args in \"relay <dn> [massage]\" line\n",
|
||||
Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
|
||||
"%s: line %d: extra cruft in \"relay <dn> [massage]\" line.\n",
|
||||
fname, lineno );
|
||||
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;
|
||||
}
|
||||
@ -65,7 +74,8 @@ relay_back_db_config(
|
||||
dn.bv_len = strlen( argv[ 1 ] );
|
||||
rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn, NULL );
|
||||
if ( rc != LDAP_SUCCESS ) {
|
||||
fprintf( stderr, "%s: line %d: "
|
||||
Log3( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
|
||||
"%s: line %d: "
|
||||
"relay dn \"%s\" is invalid "
|
||||
"in \"relay <dn> [massage]\" line\n",
|
||||
fname, lineno, argv[ 1 ] );
|
||||
@ -74,7 +84,8 @@ relay_back_db_config(
|
||||
|
||||
bd = select_backend( &ndn, 0, 1 );
|
||||
if ( bd == NULL ) {
|
||||
fprintf( stderr, "%s: line %d: "
|
||||
Log3( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
|
||||
"%s: line %d: "
|
||||
"cannot find database "
|
||||
"of relay dn \"%s\" "
|
||||
"in \"relay <dn> [massage]\" line\n",
|
||||
@ -82,7 +93,8 @@ relay_back_db_config(
|
||||
return 1;
|
||||
|
||||
} else if ( bd == be ) {
|
||||
fprintf( stderr, "%s: line %d: "
|
||||
Log3( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
|
||||
"%s: line %d: "
|
||||
"relay dn \"%s\" would call self "
|
||||
"in \"relay <dn> [massage]\" line\n",
|
||||
fname, lineno, pdn.bv_val );
|
||||
@ -92,7 +104,8 @@ relay_back_db_config(
|
||||
ri->ri_realsuffix = ndn;
|
||||
|
||||
if ( overlay_config( be, "rwm" ) ) {
|
||||
fprintf( stderr, "%s: line %d: unable to install "
|
||||
Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
|
||||
"%s: line %d: unable to install "
|
||||
"rwm overlay "
|
||||
"in \"relay <dn> [massage]\" line\n",
|
||||
fname, lineno );
|
||||
@ -103,7 +116,8 @@ relay_back_db_config(
|
||||
char *cargv[ 4 ];
|
||||
|
||||
if ( strcmp( argv[2], "massage" ) != 0 ) {
|
||||
fprintf( stderr, "%s: line %d: "
|
||||
Log3( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
|
||||
"%s: line %d: "
|
||||
"unknown directive \"%s\" "
|
||||
"in \"relay <dn> [massage]\" line\n",
|
||||
fname, lineno, argv[ 2 ] );
|
||||
|
Loading…
Reference in New Issue
Block a user