upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 10:09:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Misc Bug Fix:

Browse source 
- Remove unused variables
- Remove the attribute for component filter test in core.schema
This commit is contained in:
Sang Seok Lim 2004-08-26 16:43:28 +00:00
parent 8d1f26b7b6
commit 78d08a8271
4 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
servers/slapd/asn.h
View file

@ -16,14 +16,12 @@
*/
#ifdef LDAP_COMP_MATCH
#include <asn-incl.h>
#ifndef _H_ASN
#define _H_ASN
#define AsnId AsnOcts
#define NUM_ENCODING_TYPE 2
typedef enum { BER, GSER } EncRulesType;
typedef enum { ASN_BASIC, ASN_COMPOSITE } AsnType;
static EncRulesType rulesListG[NUM_ENCODING_TYPE] = { BER, GSER };
typedef enum AsnTypeId {
BASICTYPE_BOOLEAN, /* 1 */
@ -65,3 +63,4 @@ typedef enum AsnTypeId {
ASNTYPE_END
} AsnTypeId;
#endif
#endif

2
servers/slapd/component.c
View file

@ -781,8 +781,6 @@ test_comp_filter_item(
int rc = LDAP_COMPARE_TRUE;
int len;
ComponentSyntaxInfo* csi_attr, *csi_assert;
GenBuf* genBuf;
ExpBuf* buf;
if ( (ca->ca_ma_rule->smr_usage & SLAP_MR_COMPONENT) && ca->ca_cf ) {
/* componentFilterMatch inside of componentFilterMatch */

8
servers/slapd/schema/core.schema
View file

@ -255,12 +255,6 @@ attributetype ( 2.5.4.37 NAME 'cACertificate'
EQUALITY certificateExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )
# Component Filter Testing
attributetype ( 1.3.6.1.4.1.4203.666.1.33 NAME 'componentTest'
DESC 'RFC3687 Component Matching , use ;gser'
EQUALITY componentFilterMatch
SYNTAX 1.2.36.79672281.1.5.2 )
# Must be transferred using ;binary
attributetype ( 2.5.4.38 NAME 'authorityRevocationList'
DESC 'RFC2256: X.509 authority revocation list, use ;binary'
@ -391,7 +385,7 @@ objectclass ( 2.5.6.6 NAME 'person'
DESC 'RFC2256: a person'
SUP top STRUCTURAL
MUST ( sn $ cn )
MAY ( userPassword $ telephoneNumber $ seeAlso $ description $componentTest ) )
MAY ( userPassword $ telephoneNumber $ seeAlso $ description ) )
objectclass ( 2.5.6.7 NAME 'organizationalPerson'
DESC 'RFC2256: an organizational person'

4
servers/slapd/slap.h
View file

@ -2556,13 +2556,13 @@ typedef struct slap_component_assertion_value {
#include "asn.h"
typedef int encoder_func LDAP_P((
GenBuf* b,
void* b,
void* comp));
struct slap_component_syntax_info;
typedef int decoder_func LDAP_P((
GenBuf* b,
void* b,
struct slap_component_syntax_info** comp_syn_info,
unsigned int* len,
int mode));