From 1d0e916c6f92e4a76375ee8dcbcc59ea8f7927e4 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 15 Sep 2002 22:22:51 +0000 Subject: [PATCH] Misc CLIENT_UPDATE cleanups --- servers/slapd/controls.c | 10 +++++----- servers/slapd/result.c | 4 ---- servers/slapd/schema_init.c | 6 ------ servers/slapd/schema_prep.c | 2 -- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c index 7489fb66a4..7c26ff1c38 100644 --- a/servers/slapd/controls.c +++ b/servers/slapd/controls.c @@ -703,15 +703,15 @@ static int parseClientUpdate ( /* TODO : Cookie Scheme Validation */ #if 0 - if ( lcup_cookie_validate(scheme, cookie) != LDAP_SUCCESS ) { - *text = "Invalid LCUP cookie"; - return LCUP_INVALID_COOKIE; - } - if ( lcup_cookie_scheme_validate(scheme) != LDAP_SUCCESS ) { *text = "Unsupported LCUP cookie scheme"; return LCUP_UNSUPPORTED_SCHEME; } + + if ( lcup_cookie_validate(scheme, cookie) != LDAP_SUCCESS ) { + *text = "Invalid LCUP cookie"; + return LCUP_INVALID_COOKIE; + } #endif ber_dupbv( &op->o_clientupdate_state, &cookie ); diff --git a/servers/slapd/result.c b/servers/slapd/result.c index 425db124c5..65ef7ae290 100644 --- a/servers/slapd/result.c +++ b/servers/slapd/result.c @@ -224,10 +224,6 @@ send_ldap_response( return; } -#ifndef LDAP_CLIENT_UPDATE - assert( ctrls == NULL ); /* ctrls not implemented */ -#endif /* LDAP_CLIENT_UPDATE */ - ber_init_w_nullc( ber, LBER_USE_DER ); #ifdef NEW_LOGGING diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index af322982a3..5409bc1e00 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -59,10 +59,7 @@ #define caseIgnoreOrderingMatch caseIgnoreMatch #define caseExactOrderingMatch caseExactMatch #define integerOrderingMatch integerMatch - -#ifdef LDAP_CLIENT_UPDATE #define octetStringOrderingMatch octetStringMatch -#endif /* LDAP_CLIENT_UPDATE */ /* unimplemented matching routines */ #define caseIgnoreListMatch NULL @@ -4462,7 +4459,6 @@ char *objectIdentifierFirstComponentMatchSyntaxes[] = { * Other matching rules in X.520 that we do not use (yet): * * 2.5.13.9 numericStringOrderingMatch - * 2.5.13.18 octetStringOrderingMatch * 2.5.13.19 octetStringSubstringsMatch * 2.5.13.25 uTCTimeMatch * 2.5.13.26 uTCTimeOrderingMatch @@ -4635,14 +4631,12 @@ static slap_mrule_defs_rec mrule_defs[] = { octetStringMatch, octetStringIndexer, octetStringFilter, NULL}, -#ifdef LDAP_CLIENT_UPDATE {"( 2.5.13.18 NAME 'octetStringOrderingMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )", SLAP_MR_ORDERING, NULL, NULL, NULL, octetStringOrderingMatch, NULL, NULL, NULL}, -#endif /* LDAP_CLIENT_UPDATE */ {"( 2.5.13.20 NAME 'telephoneNumberMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )", diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c index b9bf64226e..ed5b819b57 100644 --- a/servers/slapd/schema_prep.c +++ b/servers/slapd/schema_prep.c @@ -450,9 +450,7 @@ static struct slap_schema_ad_map { { "entryCSN", "( 1.3.6.1.4.1.4203.666.1.7 NAME 'entryCSN' " "DESC 'LCUP/LDUP: change sequence number' " "EQUALITY octetStringMatch " -#ifdef LDAP_CLIENT_UPDATE "ORDERING octetStringOrderingMatch " -#endif /* LDAP_CLIENT_UPDATE */ "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} " "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )", NULL, SLAP_AT_HIDE, -- 2.39.5