mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

make names unique, since back-ldap/back-meta still have/use suffix_massage* routines

Browse Source
This commit is contained in:
Pierangelo Masarati 2003-12-10 00:15:02 +00:00
parent b5bba83a31
commit 409003a731
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/slapd/overlays/rwm.c
View File

@ -428,7 +428,7 @@ rwm_suffixmassage_config(
* The suffix massaging is emulated
* by means of the rewrite capabilities
*/
rc = suffix_massage_config( rwmap->rwm_rw,
rc = rwm_suffix_massage_config( rwmap->rwm_rw,
&pvnc, &nvnc, &prnc, &nrnc );
free( nvnc.bv_val );
free( pvnc.bv_val );

6
servers/slapd/overlays/rwm.h
View File

@ -122,12 +122,12 @@ rwm_filter_map_rewrite(
/* suffix massaging by means of librewrite */
#ifdef ENABLE_REWRITE
extern int suffix_massage_config( struct rewrite_info *info,
extern int rwm_suffix_massage_config( struct rewrite_info *info,
struct berval *pvnc, struct berval *nvnc,
struct berval *prnc, struct berval *nrnc);
#endif /* ENABLE_REWRITE */
extern int ldap_dnattr_rewrite( dncookie *dc, BerVarray a_vals );
extern int ldap_dnattr_result_rewrite( dncookie *dc, BerVarray a_vals );
extern int rwm_dnattr_rewrite( dncookie *dc, BerVarray a_vals );
extern int rwm_dnattr_result_rewrite( dncookie *dc, BerVarray a_vals );
LDAP_END_DECL

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

@ -192,7 +192,7 @@ error_return:;
#ifdef ENABLE_REWRITE
static char *
suffix_massage_regexize( const char *s )
rwm_suffix_massage_regexize( const char *s )
{
char *res, *ptr;
const char *p, *r;
@ -222,7 +222,7 @@ suffix_massage_regexize( const char *s )
}
static char *
suffix_massage_patternize( const char *s )
rwm_suffix_massage_patternize( const char *s )
{
ber_len_t len;
char *res;
@ -241,7 +241,7 @@ suffix_massage_patternize( const char *s )
}
int
suffix_massage_config(
rwm_suffix_massage_config(
struct rewrite_info *info,
struct berval *pvnc,
struct berval *nvnc,
@ -263,8 +263,8 @@ suffix_massage_config(
rewrite_parse( info, "<suffix massage>", ++line, 2, rargv );
rargv[ 0 ] = "rewriteRule";
rargv[ 1 ] = suffix_massage_regexize( pvnc->bv_val );
rargv[ 2 ] = suffix_massage_patternize( prnc->bv_val );
rargv[ 1 ] = rwm_suffix_massage_regexize( pvnc->bv_val );
rargv[ 2 ] = rwm_suffix_massage_patternize( prnc->bv_val );
rargv[ 3 ] = ":";
rargv[ 4 ] = NULL;
rewrite_parse( info, "<suffix massage>", ++line, 4, rargv );
@ -277,8 +277,8 @@ suffix_massage_config(
rewrite_parse( info, "<suffix massage>", ++line, 2, rargv );
rargv[ 0 ] = "rewriteRule";
rargv[ 1 ] = suffix_massage_regexize( prnc->bv_val );
rargv[ 2 ] = suffix_massage_patternize( pvnc->bv_val );
rargv[ 1 ] = rwm_suffix_massage_regexize( prnc->bv_val );
rargv[ 2 ] = rwm_suffix_massage_patternize( pvnc->bv_val );
rargv[ 3 ] = ":";
rargv[ 4 ] = NULL;
rewrite_parse( info, "<suffix massage>", ++line, 4, rargv );

4
servers/slapd/overlays/rwmmap.c
View File

@ -470,7 +470,7 @@ rwm_filter_map_rewrite(
* routines may be macros with args
*/
int
ldap_dnattr_rewrite(
rwm_dnattr_rewrite(
dncookie *dc,
BerVarray a_vals
)
@ -512,7 +512,7 @@ ldap_dnattr_rewrite(
}
int
ldap_dnattr_result_rewrite(
rwm_dnattr_result_rewrite(
dncookie *dc,
BerVarray a_vals
)