From 7a6e80cdcdf8b01aba43a8328895eb3fa5b3878d Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 23 Dec 2001 20:23:15 +0000 Subject: [PATCH] Zap dn_match(), cleanup up prototype header --- servers/slapd/dn.c | 19 ---------------- servers/slapd/proto-slap.h | 45 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c index ed692517d8..ab49adeb40 100644 --- a/servers/slapd/dn.c +++ b/servers/slapd/dn.c @@ -527,28 +527,9 @@ dn_normalize( char *dn ) return( dn ); } -int -dn_match( const char *val, const char *asserted ) -{ - struct berval bval, basserted; - - if ( val == NULL || asserted == NULL ) { - return 0; - } - - bval.bv_val = ( char * )val; - bval.bv_len = strlen( val ); - - basserted.bv_val = ( char * )asserted; - basserted.bv_len = strlen( asserted); - - return dnMatch( NULL, 0, NULL, NULL, &bval, &basserted); -} - /* * dn_parent - return the dn's parent, in-place */ - char * dn_parent( Backend *be, diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index bbbc0cce4f..3e6999a9e8 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -325,9 +325,30 @@ LDAP_SLAPD_F (void) connection_internal_close( Connection *conn ); * dn.c */ +LDAP_SLAPD_F (int) dnValidate LDAP_P(( + Syntax *syntax, + struct berval *val )); + +LDAP_SLAPD_F (int) dnNormalize LDAP_P(( + Syntax *syntax, + struct berval *val, + struct berval **normalized )); + +LDAP_SLAPD_F (int) dnPretty LDAP_P(( + Syntax *syntax, + struct berval *val, + struct berval **pretty )); + +LDAP_SLAPD_F (int) dnMatch LDAP_P(( + int *matchp, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *value, + void *assertedValue )); + LDAP_SLAPD_F (char *) dn_validate LDAP_P(( char *dn )); LDAP_SLAPD_F (char *) dn_normalize LDAP_P(( char *dn )); -LDAP_SLAPD_F (int) dn_match LDAP_P(( const char *val, const char *asserted )); LDAP_SLAPD_F (char *) dn_parent LDAP_P(( Backend *be, const char *dn )); LDAP_SLAPD_F (char **) dn_subtree LDAP_P(( Backend *be, const char *dn )); LDAP_SLAPD_F (char *) dn_rdn LDAP_P(( Backend *be, const char *dn )); @@ -751,28 +772,6 @@ LDAP_SLAPD_F( int ) mods_structural_class( LDAP_SLAPD_F (int) schema_init LDAP_P((void)); LDAP_SLAPD_F (int) schema_prep LDAP_P((void)); -LDAP_SLAPD_F (int) dnValidate LDAP_P(( - Syntax *syntax, - struct berval *val )); - -LDAP_SLAPD_F (int) dnNormalize LDAP_P(( - Syntax *syntax, - struct berval *val, - struct berval **normalized )); - -LDAP_SLAPD_F (int) dnPretty LDAP_P(( - Syntax *syntax, - struct berval *val, - struct berval **pretty )); - -LDAP_SLAPD_F (int) dnMatch LDAP_P(( - int *matchp, - slap_mask_t flags, - Syntax *syntax, - MatchingRule *mr, - struct berval *value, - void *assertedValue )); - /* * schemaparse.c */ -- 2.39.5