diff options
| author | Kamen Mazdrashki <kamenim@samba.org> | 2010-11-08 16:27:22 +0200 |
|---|---|---|
| committer | Kamen Mazdrashki <kamenim@samba.org> | 2010-11-08 23:06:41 +0000 |
| commit | 0aeb08e2eb1725ef41b6796a55a020520d13c6f7 (patch) | |
| tree | 52d2f7e495cde477c439eca5aefc004cda567bde | |
| parent | ee34e2c94bccb90f6518c401192c5f04ae509d25 (diff) | |
| download | samba-0aeb08e2eb1725ef41b6796a55a020520d13c6f7.tar.gz samba-0aeb08e2eb1725ef41b6796a55a020520d13c6f7.tar.bz2 samba-0aeb08e2eb1725ef41b6796a55a020520d13c6f7.zip | |
s4-attid: Uppercase ATTID type constants
Thanks Metze for noting this!
Autobuild-User: Kamen Mazdrashki <kamenim@samba.org>
Autobuild-Date: Mon Nov 8 23:06:41 UTC 2010 on sn-devel-104
| -rw-r--r-- | source4/dsdb/schema/prefixmap.h | 8 | ||||
| -rw-r--r-- | source4/dsdb/schema/schema_prefixmap.c | 10 | ||||
| -rw-r--r-- | source4/dsdb/schema/schema_query.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source4/dsdb/schema/prefixmap.h b/source4/dsdb/schema/prefixmap.h index 74acecb4ff..339a221fa6 100644 --- a/source4/dsdb/schema/prefixmap.h +++ b/source4/dsdb/schema/prefixmap.h @@ -27,10 +27,10 @@ * Ref: MS-ADTS, 3.1.1.2.6 ATTRTYP */ enum dsdb_attid_type { - dsdb_attid_type_pfm = 1, /* attid in [0x00000000..0x7FFFFFFF] */ - dsdb_attid_type_intid = 2, /* attid in [0x80000000..0xBFFFFFFF] */ - dsdb_attid_type_reserved = 3, /* attid in [0xC0000000..0xFFFEFFFF] */ - dsdb_attid_type_internal = 4, /* attid in [0xFFFF0000..0xFFFFFFFF] */ + DSDB_ATTID_TYPE_PFM = 1, /* attid in [0x00000000..0x7FFFFFFF] */ + DSDB_ATTID_TYPE_INTID = 2, /* attid in [0x80000000..0xBFFFFFFF] */ + DSDB_ATTID_TYPE_RESERVED = 3, /* attid in [0xC0000000..0xFFFEFFFF] */ + DSDB_ATTID_TYPE_INTERNAL = 4, /* attid in [0xFFFF0000..0xFFFFFFFF] */ }; /** diff --git a/source4/dsdb/schema/schema_prefixmap.c b/source4/dsdb/schema/schema_prefixmap.c index 18920500d6..371ec882ca 100644 --- a/source4/dsdb/schema/schema_prefixmap.c +++ b/source4/dsdb/schema/schema_prefixmap.c @@ -32,16 +32,16 @@ enum dsdb_attid_type dsdb_pfm_get_attid_type(uint32_t attid) { if (attid <= 0x7FFFFFFF) { - return dsdb_attid_type_pfm; + return DSDB_ATTID_TYPE_PFM; } else if (attid <= 0xBFFFFFFF) { - return dsdb_attid_type_intid; + return DSDB_ATTID_TYPE_INTID; } else if (attid <= 0xFFFEFFFF) { - return dsdb_attid_type_reserved; + return DSDB_ATTID_TYPE_RESERVED; } else { - return dsdb_attid_type_internal; + return DSDB_ATTID_TYPE_INTERNAL; } } @@ -361,7 +361,7 @@ WERROR dsdb_schema_pfm_oid_from_attid(struct dsdb_schema_prefixmap *pfm, uint32_ WERROR werr = WERR_OK; /* sanity check for attid requested */ - if (dsdb_pfm_get_attid_type(attid) != dsdb_attid_type_pfm) { + if (dsdb_pfm_get_attid_type(attid) != DSDB_ATTID_TYPE_PFM) { return WERR_INVALID_PARAMETER; } diff --git a/source4/dsdb/schema/schema_query.c b/source4/dsdb/schema/schema_query.c index 8ea79ff4bb..c92d273edf 100644 --- a/source4/dsdb/schema/schema_query.c +++ b/source4/dsdb/schema/schema_query.c @@ -64,7 +64,7 @@ const struct dsdb_attribute *dsdb_attribute_by_attributeID_id(const struct dsdb_ if (id == 0xFFFFFFFF) return NULL; /* check for msDS-IntId type attribute */ - if (dsdb_pfm_get_attid_type(id) == dsdb_attid_type_intid) { + if (dsdb_pfm_get_attid_type(id) == DSDB_ATTID_TYPE_INTID) { BINARY_ARRAY_SEARCH_P(schema->attributes_by_msDS_IntId, schema->num_int_id_attr, msDS_IntId, id, uint32_cmp, c); return c; |