return false;
}
- werr = dsdb_schema_pfm_make_attid(ctx->schema->prefixmap, oid, id_local);
+ werr = dsdb_schema_pfm_attid_from_oid(ctx->schema->prefixmap, oid, id_local);
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,("OID->ATTID failed (%s) for: %s\n", win_errstr(werr), oid));
return false;
DATA_BLOB *blobs;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
out->attid = dsdb_attribute_get_attid(attr,
unsigned int i;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
for (i=0; i < in->num_values; i++) {
DATA_BLOB *blobs;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
out->attid = dsdb_attribute_get_attid(attr,
unsigned int i;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
for (i=0; i < in->num_values; i++) {
long v;
+ long n;
char buf[sizeof("-2147483648")];
char *end = NULL;
return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
}
+ n = v & UINT32_MAX;
+
+ if (n != v) {
+ return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
+ }
+
+ if ((v & INT32_MIN) && buf[0] != '-') {
+ /*
+ * if the 0x80000000 bit is set, it is a negative
+ * value. We need to make sure the it was given
+ * as a negativ string value.
+ *
+ * We need to accept '-2147483647', but reject
+ * '2147483649', both represent 0x80000001.
+ */
+ return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
+ }
+
if (attr->rangeLower) {
if ((int32_t)v < (int32_t)*attr->rangeLower) {
return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
DATA_BLOB *blobs;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
out->attid = dsdb_attribute_get_attid(attr,
unsigned int i;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
for (i=0; i < in->num_values; i++) {
long long v;
+ long long n;
char buf[sizeof("-9223372036854775808")];
char *end = NULL;
return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
}
+ n = v & UINT64_MAX;
+
+ if (n != v) {
+ return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
+ }
+
+ if ((v & INT64_MIN) && buf[0] != '-') {
+ /*
+ * if the 0x8000000000000000 bit is set,
+ * it is a negative value. We need to
+ * make sure the it was given as a negative
+ * string value.
+ *
+ * We need to accept '-9223372036854775807',
+ * but reject '9223372036854775809',
+ * both represent 0x8000000000000001.
+ */
+ return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
+ }
+
if (attr->rangeLower) {
if ((int64_t)v < (int64_t)*attr->rangeLower) {
return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
DATA_BLOB *blobs;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
out->attid = dsdb_attribute_get_attid(attr,
unsigned int i;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
for (i=0; i < in->num_values; i++) {
}
if (attr->rangeUpper) {
- if ((int32_t)t > (int32_t)*attr->rangeLower) {
+ if ((int32_t)t > (int32_t)*attr->rangeUpper) {
return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
}
}
DATA_BLOB *blobs;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
out->attid = dsdb_attribute_get_attid(attr,
unsigned int i;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
for (i=0; i < in->num_values; i++) {
}
if (attr->rangeUpper) {
- if ((int32_t)t > (int32_t)*attr->rangeLower) {
+ if ((int32_t)t > (int32_t)*attr->rangeUpper) {
return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
}
}
DATA_BLOB *blobs;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
out->attid = dsdb_attribute_get_attid(attr,
const struct ldb_val *val)
{
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
if (attr->rangeLower) {
WERROR status;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
for (i=0; i < in->num_values; i++) {
W_ERROR_HAVE_NO_MEMORY(out->values);
for (i=0; i < out->num_values; i++) {
- uint32_t v;
+ uint32_t v, vo;
const struct dsdb_class *c;
const char *str;
}
v = IVAL(in->value_ctr.values[i].blob->data, 0);
+ vo = v;
/* convert remote ATTID to local ATTID */
if (!dsdb_syntax_attid_from_remote_attid(ctx, mem_ctx, v, &v)) {
c = dsdb_class_by_governsID_id(ctx->schema, v);
if (!c) {
- DEBUG(1,(__location__ ": Unknown governsID 0x%08X\n", v));
- return WERR_FOOBAR;
+ int dbg_level = ctx->schema->resolving_in_progress ? 10 : 0;
+ DEBUG(dbg_level,(__location__ ": %s unknown local governsID 0x%08X remote 0x%08X%s\n",
+ attr->lDAPDisplayName, v, vo,
+ ctx->schema->resolving_in_progress ? "resolving in progress" : ""));
+ return WERR_DS_OBJ_CLASS_NOT_DEFINED;
}
str = talloc_strdup(out->values, c->lDAPDisplayName);
W_ERROR_HAVE_NO_MEMORY(out->values);
for (i=0; i < out->num_values; i++) {
- uint32_t v;
+ uint32_t v, vo;
const struct dsdb_attribute *a;
const char *str;
}
v = IVAL(in->value_ctr.values[i].blob->data, 0);
+ vo = v;
/* convert remote ATTID to local ATTID */
if (!dsdb_syntax_attid_from_remote_attid(ctx, mem_ctx, v, &v)) {
a = dsdb_attribute_by_attributeID_id(ctx->schema, v);
if (!a) {
- DEBUG(1,(__location__ ": Unknown attributeID_id 0x%08X\n", v));
- return WERR_FOOBAR;
+ int dbg_level = ctx->schema->resolving_in_progress ? 10 : 0;
+ DEBUG(dbg_level,(__location__ ": %s unknown local attributeID_id 0x%08X remote 0x%08X%s\n",
+ attr->lDAPDisplayName, v, vo,
+ ctx->schema->resolving_in_progress ? "resolving in progress" : ""));
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
str = talloc_strdup(out->values, a->lDAPDisplayName);
struct drsuapi_DsReplicaAttribute *out)
{
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
switch (attr->attributeID_id) {
TALLOC_CTX *tmp_ctx;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
switch (attr->attributeID_id) {
return WERR_FOOBAR;
}
- out->values[i] = data_blob_string_const(str);
+ out->values[i] = data_blob_const(str, converted_size);
}
return WERR_OK;
DATA_BLOB *blobs;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
out->attid = dsdb_attribute_get_attid(attr,
bool ok;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
ok = convert_string_talloc(ctx->ldb,
unsigned int i;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
for (i=0; i < in->num_values; i++) {
DATA_BLOB *blobs;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
out->attid = dsdb_attribute_get_attid(attr,
W_ERROR_HAVE_NO_MEMORY(tmp_ctx);
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
dsdb_dn = dsdb_dn_parse(tmp_ctx, ctx->ldb, val,
dn2 = ldb_dn_copy(tmp_ctx, dn);
if (dn == NULL) {
talloc_free(tmp_ctx);
- return WERR_NOMEM;
+ return WERR_NOT_ENOUGH_MEMORY;
}
num_components = ldb_dn_get_comp_num(dn);
unsigned int i;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
for (i=0; i < in->num_values; i++) {
DATA_BLOB *blobs;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
out->attid = dsdb_attribute_get_attid(attr,
unsigned int i;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
for (i=0; i < in->num_values; i++) {
unsigned int i;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
for (i=0; i < in->num_values; i++) {
DATA_BLOB *blobs;
if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
out->attid = dsdb_attribute_get_attid(attr,
.validate_ldb = dsdb_syntax_DATA_BLOB_validate_ldb,
.equality = "octetStringMatch",
.comment = "Octet String",
+ .userParameters = true,
+ .ldb_syntax = LDB_SYNTAX_SAMBA_OCTET_STRING
},{
.name = "String(Sid)",
.ldap_oid = LDB_SYNTAX_OCTET_STRING,
.drsuapi_to_ldb = dsdb_syntax_DATA_BLOB_drsuapi_to_ldb,
.ldb_to_drsuapi = dsdb_syntax_DATA_BLOB_ldb_to_drsuapi,
.validate_ldb = dsdb_syntax_DATA_BLOB_validate_ldb,
- .ldb_syntax = LDB_SYNTAX_OCTET_STRING,
+ .ldb_syntax = LDB_SYNTAX_SAMBA_OCTET_STRING,
},{
.name = "String(Teletex)",
.ldap_oid = "1.2.840.113556.1.4.905",
.validate_ldb = dsdb_syntax_DATA_BLOB_validate_ldb,
.equality = "caseExactIA5Match",
.comment = "Printable String",
- .ldb_syntax = LDB_SYNTAX_OCTET_STRING,
+ .ldb_syntax = LDB_SYNTAX_SAMBA_OCTET_STRING,
},{
.name = "String(UTC-Time)",
.ldap_oid = "1.3.6.1.4.1.1466.115.121.1.53",
.validate_ldb = dsdb_syntax_NTTIME_validate_ldb,
.equality = "generalizedTimeMatch",
.comment = "Generalized Time",
- .ldb_syntax = LDB_SYNTAX_UTC_TIME,
.auto_normalise = true
},{
/* not used in w2k3 schema */
* as Directory String (LDB_SYNTAX_DIRECTORY_STRING), but case sensitive.
* But according to ms docs binary compare should do the job:
* http://msdn.microsoft.com/en-us/library/cc223200(v=PROT.10).aspx */
- .ldb_syntax = LDB_SYNTAX_OCTET_STRING,
+ .ldb_syntax = LDB_SYNTAX_SAMBA_OCTET_STRING,
},{
.name = "String(Unicode)",
.ldap_oid = LDB_SYNTAX_DIRECTORY_STRING,
},{
/* not used in w2k3 schema */
.name = "Object(Access-Point)",
- .ldap_oid = "1.3.6.1.4.1.1466.115.121.1.2",
+ .ldap_oid = DSDB_SYNTAX_ACCESS_POINT,
.oMSyntax = 127,
.oMObjectClass = OMOBJECTCLASS("\x2b\x0c\x02\x87\x73\x1c\x00\x85\x3e"),
.attributeSyntax_oid = "2.5.5.14",
unsigned int i;
for (i=0; i < ARRAY_SIZE(dsdb_syntaxes); i++) {
+ /*
+ * We must pretend that userParameters was declared
+ * binary string, so we can store the 'UTF16' (not
+ * really string) structure as given over SAMR to samba
+ */
+ if (dsdb_syntaxes[i].userParameters &&
+ (strcasecmp(attr->lDAPDisplayName, "userParameters") == 0))
+ {
+ return &dsdb_syntaxes[i];
+ }
if (attr->oMSyntax != dsdb_syntaxes[i].oMSyntax) continue;
if (attr->oMObjectClass.length != dsdb_syntaxes[i].oMObjectClass.length) continue;
return NULL;
}
-WERROR dsdb_attribute_drsuapi_to_ldb(struct ldb_context *ldb,
- const struct dsdb_schema *schema,
- const struct dsdb_schema_prefixmap *pfm_remote,
- const struct drsuapi_DsReplicaAttribute *in,
- TALLOC_CTX *mem_ctx,
- struct ldb_message_element *out)
+WERROR dsdb_attribute_drsuapi_remote_to_local(const struct dsdb_syntax_ctx *ctx,
+ enum drsuapi_DsAttributeId remote_attid_as_enum,
+ enum drsuapi_DsAttributeId *local_attid_as_enum,
+ const struct dsdb_attribute **_sa)
{
+ TALLOC_CTX *frame = talloc_stackframe();
const struct dsdb_attribute *sa;
- struct dsdb_syntax_ctx syntax_ctx;
uint32_t attid_local;
+ bool ok;
- /* use default syntax conversion context */
- dsdb_syntax_ctx_init(&syntax_ctx, ldb, schema);
- syntax_ctx.pfm_remote = pfm_remote;
+ if (ctx->pfm_remote == NULL) {
+ smb_panic(__location__);
+ }
- switch (dsdb_pfm_get_attid_type(in->attid)) {
+ switch (dsdb_pfm_get_attid_type(remote_attid_as_enum)) {
case DSDB_ATTID_TYPE_PFM:
/* map remote ATTID to local ATTID */
- if (!dsdb_syntax_attid_from_remote_attid(&syntax_ctx, mem_ctx, in->attid, &attid_local)) {
+ ok = dsdb_syntax_attid_from_remote_attid(ctx, frame,
+ remote_attid_as_enum,
+ &attid_local);
+ if (!ok) {
DEBUG(0,(__location__ ": Can't find local ATTID for 0x%08X\n",
- in->attid));
- return WERR_FOOBAR;
+ remote_attid_as_enum));
+ TALLOC_FREE(frame);
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
break;
case DSDB_ATTID_TYPE_INTID:
/* use IntId value directly */
- attid_local = in->attid;
+ attid_local = remote_attid_as_enum;
break;
default:
/* we should never get here */
DEBUG(0,(__location__ ": Invalid ATTID type passed for conversion - 0x%08X\n",
- in->attid));
+ remote_attid_as_enum));
+ TALLOC_FREE(frame);
return WERR_INVALID_PARAMETER;
}
- sa = dsdb_attribute_by_attributeID_id(schema, attid_local);
+ sa = dsdb_attribute_by_attributeID_id(ctx->schema, attid_local);
if (!sa) {
- DEBUG(1,(__location__ ": Unknown attributeID_id 0x%08X\n", in->attid));
- return WERR_FOOBAR;
+ int dbg_level = ctx->schema->resolving_in_progress ? 10 : 0;
+ DEBUG(dbg_level,(__location__ ": Unknown local attributeID_id 0x%08X remote 0x%08X%s\n",
+ attid_local, remote_attid_as_enum,
+ ctx->schema->resolving_in_progress ? "resolving in progress" : ""));
+ TALLOC_FREE(frame);
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
+ }
+
+ /*
+ * We return the same class of attid as we were given. That
+ * is, we trust the remote server not to use an
+ * msDS-IntId value in the schema partition
+ */
+ if (local_attid_as_enum != NULL) {
+ *local_attid_as_enum = (enum drsuapi_DsAttributeId)attid_local;
+ }
+
+ if (_sa != NULL) {
+ *_sa = sa;
+ }
+
+ TALLOC_FREE(frame);
+ return WERR_OK;
+}
+
+WERROR dsdb_attribute_drsuapi_to_ldb(struct ldb_context *ldb,
+ const struct dsdb_schema *schema,
+ const struct dsdb_schema_prefixmap *pfm_remote,
+ const struct drsuapi_DsReplicaAttribute *in,
+ TALLOC_CTX *mem_ctx,
+ struct ldb_message_element *out,
+ enum drsuapi_DsAttributeId *local_attid_as_enum)
+{
+ struct dsdb_syntax_ctx syntax_ctx;
+ const struct dsdb_attribute *sa = NULL;
+ WERROR werr;
+
+ /* use default syntax conversion context */
+ dsdb_syntax_ctx_init(&syntax_ctx, ldb, schema);
+ syntax_ctx.pfm_remote = pfm_remote;
+
+ werr = dsdb_attribute_drsuapi_remote_to_local(&syntax_ctx,
+ in->attid,
+ local_attid_as_enum,
+ &sa);
+ if (!W_ERROR_IS_OK(werr)) {
+ return werr;
}
return sa->syntax->drsuapi_to_ldb(&syntax_ctx, sa, in, mem_ctx, out);
sa = dsdb_attribute_by_lDAPDisplayName(schema, in->name);
if (!sa) {
- return WERR_FOOBAR;
+ return WERR_DS_ATT_NOT_DEF_IN_SCHEMA;
}
/* use default syntax conversion context */
git.samba.org / metze / samba / wip.git / blobdiff