diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-12-19 16:37:04 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-12-21 15:10:37 +1100 |
| commit | 912faf1b080736a4855e3ea99b49f0ccbf76af33 (patch) | |
| tree | c23016201862beaf02f2b3a533f844147c626a42 /source4/dsdb | |
| parent | ef618f577870f28b8efd472a87d4dcf094d67d29 (diff) | |
| download | samba-912faf1b080736a4855e3ea99b49f0ccbf76af33.tar.gz samba-912faf1b080736a4855e3ea99b49f0ccbf76af33.tar.bz2 samba-912faf1b080736a4855e3ea99b49f0ccbf76af33.zip | |
s4:dsdb/schema/schema_* - adaptions needed for removed "const" on OIDs
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/schema/schema_prefixmap.c | 5 | ||||
| -rw-r--r-- | source4/dsdb/schema/schema_syntax.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/dsdb/schema/schema_prefixmap.c b/source4/dsdb/schema/schema_prefixmap.c index f900f40a90..aa30fc285b 100644 --- a/source4/dsdb/schema/schema_prefixmap.c +++ b/source4/dsdb/schema/schema_prefixmap.c @@ -375,6 +375,7 @@ WERROR dsdb_schema_pfm_oid_from_attid(const struct dsdb_schema_prefixmap *pfm, uint32_t i; uint32_t hi_word, lo_word; DATA_BLOB bin_oid = {NULL, 0}; + char *oid; struct dsdb_schema_prefixmap_oid *pfm_entry; WERROR werr = WERR_OK; @@ -420,7 +421,7 @@ WERROR dsdb_schema_pfm_oid_from_attid(const struct dsdb_schema_prefixmap *pfm, bin_oid.data[bin_oid.length-1] = lo_word & 0x7f; } - if (!ber_read_OID_String(mem_ctx, bin_oid, _oid)) { + if (!ber_read_OID_String(mem_ctx, bin_oid, &oid)) { DEBUG(0,("ber_read_OID_String() failed for %s\n", hex_encode_talloc(bin_oid.data, bin_oid.data, bin_oid.length))); werr = WERR_INTERNAL_ERROR; @@ -429,6 +430,8 @@ WERROR dsdb_schema_pfm_oid_from_attid(const struct dsdb_schema_prefixmap *pfm, /* free locally allocated memory */ talloc_free(bin_oid.data); + *_oid = oid; + return werr; } diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c index 1bb9a4f785..715f219530 100644 --- a/source4/dsdb/schema/schema_syntax.c +++ b/source4/dsdb/schema/schema_syntax.c @@ -1376,7 +1376,7 @@ static WERROR _dsdb_syntax_OID_validate_numericoid(const struct dsdb_syntax_ctx for (i=0; i < in->num_values; i++) { DATA_BLOB blob; - const char *oid_out; + char *oid_out; const char *oid = (const char*)in->values[i].data; if (!ber_write_OID_String(tmp_ctx, &blob, oid)) { |