mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

previous commit contradicts man page; see comment in code

Browse Source
This commit is contained in:
Pierangelo Masarati 2006-01-14 10:03:11 +00:00
parent af83c5e242
commit f3dba23fbb
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
servers/slapd/back-relay/config.c
View File

@ -104,6 +104,25 @@ relay_back_db_config(
return 1; 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
* have automatic instantiation only when "massage"
* is specified, so one has better control on
* where the overlay gets instantiated, but this
* would break compatibility. One can still control
* where the overlay is instantiated by moving
* around the "relay" directive, although this could
* make slapd.conf a bit confusing. */
if ( overlay_config( be, "rwm" ) ) {
Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"%s: line %d: unable to install "
"rwm overlay "
"in \"relay <dn> [massage]\" line\n",
fname, lineno );
return 1;
}
dn.bv_val = argv[ 1 ]; dn.bv_val = argv[ 1 ];
dn.bv_len = strlen( argv[ 1 ] ); dn.bv_len = strlen( argv[ 1 ] );
rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn, NULL ); rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn, NULL );
@ -142,16 +161,6 @@ relay_back_db_config(
if ( argc == 3 ) { if ( argc == 3 ) {
char *cargv[ 4 ]; char *cargv[ 4 ];
if ( overlay_config( be, "rwm" ) ) {
Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"%s: line %d: unable to install "
"rwm overlay "
"in \"relay <dn> [massage]\" line\n",
fname, lineno );
rc = 1;
goto relay_done;
}
cargv[ 0 ] = "rwm-suffixmassage"; cargv[ 0 ] = "rwm-suffixmassage";
cargv[ 1 ] = be->be_suffix[0].bv_val; cargv[ 1 ] = be->be_suffix[0].bv_val;
cargv[ 2 ] = pdn.bv_val; cargv[ 2 ] = pdn.bv_val;