mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-24 13:24:56 +08:00
fix misinitialized UNDEFINED attribute type; reordered members of AttributeType because I don't know a portable way to statically initialize a mutex :)
This commit is contained in:
parent
a4c9c2c06e
commit
d262aae706
@ -217,15 +217,17 @@ struct slap_schema_ad_map {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static AttributeType slap_at_undefined = {
|
static AttributeType slap_at_undefined = {
|
||||||
"UNDEFINED", /* cname */
|
|
||||||
{ "1.1.1", NULL, NULL, 1, NULL,
|
{ "1.1.1", NULL, NULL, 1, NULL,
|
||||||
NULL, NULL, NULL, NULL,
|
NULL, NULL, NULL, NULL,
|
||||||
0, 0, 0, 1, 3 },
|
0, 0, 0, 1, 3 }, /* LDAPAttributeType */
|
||||||
|
{ sizeof( "UNDEFINED" ) - 1, "UNDEFINED" }, /* cname */
|
||||||
NULL, /* sup */
|
NULL, /* sup */
|
||||||
NULL, /* subtypes */
|
NULL, /* subtypes */
|
||||||
NULL, NULL, NULL, NULL, /* matching rules */
|
NULL, NULL, NULL, NULL, /* matching rules */
|
||||||
NULL, /* syntax (this may need to be defined) */
|
NULL, /* syntax (this may need to be defined) */
|
||||||
|
NULL, /* attribute description */
|
||||||
NULL /* next */
|
NULL /* next */
|
||||||
|
/* mutex (don't know how to initialize it :) */
|
||||||
};
|
};
|
||||||
|
|
||||||
struct slap_schema_mr_map {
|
struct slap_schema_mr_map {
|
||||||
|
@ -378,9 +378,9 @@ typedef struct slap_attribute_type {
|
|||||||
MatchingRule *sat_ordering;
|
MatchingRule *sat_ordering;
|
||||||
MatchingRule *sat_substr;
|
MatchingRule *sat_substr;
|
||||||
Syntax *sat_syntax;
|
Syntax *sat_syntax;
|
||||||
ldap_pvt_thread_mutex_t sat_ad_mutex;
|
|
||||||
struct slap_attr_desc *sat_ad;
|
struct slap_attr_desc *sat_ad;
|
||||||
struct slap_attribute_type *sat_next;
|
struct slap_attribute_type *sat_next;
|
||||||
|
ldap_pvt_thread_mutex_t sat_ad_mutex;
|
||||||
#define sat_oid sat_atype.at_oid
|
#define sat_oid sat_atype.at_oid
|
||||||
#define sat_names sat_atype.at_names
|
#define sat_names sat_atype.at_names
|
||||||
#define sat_desc sat_atype.at_desc
|
#define sat_desc sat_atype.at_desc
|
||||||
|
Loading…
Reference in New Issue
Block a user