mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

allow rwm to work with either the real or the virtual naming context equal to the empty DN

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-10-08 10:56:10 +00:00
parent 851c65ac5b
commit 5420344f05
1 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
servers/slapd/overlays/rwmconf.c
View File

@ -248,6 +248,10 @@ rwm_suffix_massage_regexize( const char *s )
const char *p, *r; const char *p, *r;
int i; int i;
if ( s[0] == '\0' ) {
return ch_strdup( "(.+)" );
}
for ( i = 0, p = s; for ( i = 0, p = s;
( r = strchr( p, ',' ) ) != NULL; ( r = strchr( p, ',' ) ) != NULL;
p = r + 1, i++ ) p = r + 1, i++ )
@ -277,20 +281,28 @@ rwm_suffix_massage_regexize( const char *s )
} }
static char * static char *
rwm_suffix_massage_patternize( const char *s ) rwm_suffix_massage_patternize( const char *s, const char *p )
{ {
ber_len_t len; ber_len_t len;
char *res; char *res, *ptr;
len = strlen( s ); len = strlen( p );
if ( s[ 0 ] == '\0' ) {
len++;
}
res = ch_calloc( sizeof( char ), len + STRLENOF( "%1" ) + 1 ); res = ch_calloc( sizeof( char ), len + STRLENOF( "%1" ) + 1 );
if ( res == NULL ) { if ( res == NULL ) {
return NULL; return NULL;
} }
strcpy( res, "%1" ); ptr = lutil_strcopy( res, ( p[0] == '\0' ? "%2" : "%1" ) );
strcpy( res + STRLENOF( "%1" ), s ); if ( s[ 0 ] == '\0' ) {
ptr[ 0 ] = ',';
ptr++;
}
lutil_strcopy( ptr, p );
return res; return res;
} }
@ -319,13 +331,22 @@ rwm_suffix_massage_config(
rargv[ 0 ] = "rewriteRule"; rargv[ 0 ] = "rewriteRule";
rargv[ 1 ] = rwm_suffix_massage_regexize( pvnc->bv_val ); rargv[ 1 ] = rwm_suffix_massage_regexize( pvnc->bv_val );
rargv[ 2 ] = rwm_suffix_massage_patternize( prnc->bv_val ); rargv[ 2 ] = rwm_suffix_massage_patternize( pvnc->bv_val, prnc->bv_val );
rargv[ 3 ] = ":"; rargv[ 3 ] = ":";
rargv[ 4 ] = NULL; rargv[ 4 ] = NULL;
rewrite_parse( info, "<suffix massage>", ++line, 4, rargv ); rewrite_parse( info, "<suffix massage>", ++line, 4, rargv );
ch_free( rargv[ 1 ] ); ch_free( rargv[ 1 ] );
ch_free( rargv[ 2 ] ); ch_free( rargv[ 2 ] );
if ( BER_BVISEMPTY( pvnc ) ) {
rargv[ 0 ] = "rewriteRule";
rargv[ 1 ] = "^$";
rargv[ 2 ] = prnc->bv_val;
rargv[ 3 ] = ":";
rargv[ 4 ] = NULL;
rewrite_parse( info, "<suffix massage>", ++line, 4, rargv );
}
rargv[ 0 ] = "rewriteContext"; rargv[ 0 ] = "rewriteContext";
rargv[ 1 ] = "searchEntryDN"; rargv[ 1 ] = "searchEntryDN";
rargv[ 2 ] = NULL; rargv[ 2 ] = NULL;
@ -333,13 +354,22 @@ rwm_suffix_massage_config(
rargv[ 0 ] = "rewriteRule"; rargv[ 0 ] = "rewriteRule";
rargv[ 1 ] = rwm_suffix_massage_regexize( prnc->bv_val ); rargv[ 1 ] = rwm_suffix_massage_regexize( prnc->bv_val );
rargv[ 2 ] = rwm_suffix_massage_patternize( pvnc->bv_val ); rargv[ 2 ] = rwm_suffix_massage_patternize( prnc->bv_val, pvnc->bv_val );
rargv[ 3 ] = ":"; rargv[ 3 ] = ":";
rargv[ 4 ] = NULL; rargv[ 4 ] = NULL;
rewrite_parse( info, "<suffix massage>", ++line, 4, rargv ); rewrite_parse( info, "<suffix massage>", ++line, 4, rargv );
ch_free( rargv[ 1 ] ); ch_free( rargv[ 1 ] );
ch_free( rargv[ 2 ] ); ch_free( rargv[ 2 ] );
if ( BER_BVISEMPTY( prnc ) ) {
rargv[ 0 ] = "rewriteRule";
rargv[ 1 ] = "^$";
rargv[ 2 ] = pvnc->bv_val;
rargv[ 3 ] = ":";
rargv[ 4 ] = NULL;
rewrite_parse( info, "<suffix massage>", ++line, 4, rargv );
}
rargv[ 0 ] = "rewriteContext"; rargv[ 0 ] = "rewriteContext";
rargv[ 1 ] = "matchedDN"; rargv[ 1 ] = "matchedDN";
rargv[ 2 ] = "alias"; rargv[ 2 ] = "alias";