#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "librpc/gen_ndr/ndr_misc.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
#include "system/time.h"
#include "../lib/util/charset/charset.h"
#include "librpc/ndr/libndr.h"
return attr->attributeID_id;
}
+/**
+ * Map an ATTID from remote DC to a local ATTID
+ * using remote prefixMap
+ */
+static bool dsdb_syntax_attid_from_remote_attid(const struct dsdb_syntax_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
+ uint32_t id_remote,
+ uint32_t *id_local)
+{
+ WERROR werr;
+ const char *oid;
+
+ /*
+ * map remote ATTID to local directly in case
+ * of no remote prefixMap (during provision for instance)
+ */
+ if (!ctx->pfm_remote) {
+ *id_local = id_remote;
+ return true;
+ }
+
+ werr = dsdb_schema_pfm_oid_from_attid(ctx->pfm_remote, id_remote, mem_ctx, &oid);
+ if (!W_ERROR_IS_OK(werr)) {
+ DEBUG(0,("ATTID->OID failed (%s) for: 0x%08X\n", win_errstr(werr), id_remote));
+ return false;
+ }
+
+ 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;
+ }
+
+ return true;
+}
static WERROR dsdb_syntax_FOOBAR_drsuapi_to_ldb(const struct dsdb_syntax_ctx *ctx,
const struct dsdb_attribute *attr,
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,
blobs[i] = data_blob_talloc(blobs, NULL, 4);
W_ERROR_HAVE_NO_MEMORY(blobs[i].data);
- if (strcmp("TRUE", (const char *)in->values[i].data) == 0) {
+ if (in->values[i].length >= 4 &&
+ strncmp("TRUE", (const char *)in->values[i].data, in->values[i].length) == 0) {
SIVAL(blobs[i].data, 0, 0x00000001);
- } else if (strcmp("FALSE", (const char *)in->values[i].data) == 0) {
+ } else if (in->values[i].length >= 5 &&
+ strncmp("FALSE", (const char *)in->values[i].data, in->values[i].length) == 0) {
SIVAL(blobs[i].data, 0, 0x00000000);
} else {
return WERR_FOOBAR;
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++) {
- int t, f;
+ if (in->values[i].length == 0) {
+ return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
+ }
- t = strncmp("TRUE",
+ if (in->values[i].length >= 4 &&
+ strncmp("TRUE",
(const char *)in->values[i].data,
- in->values[i].length);
- f = strncmp("FALSE",
+ in->values[i].length) == 0) {
+ continue;
+ }
+ if (in->values[i].length >= 5 &&
+ strncmp("FALSE",
(const char *)in->values[i].data,
- in->values[i].length);
-
- if (t != 0 && f != 0) {
- return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
+ in->values[i].length) == 0) {
+ continue;
}
+ return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
}
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,
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) {
+ DEBUG(0,("invalid[%s] n[%ld] v[%ld]\n",
+ buf, 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.
+ */
+ DEBUG(0,("invalid[%s] n[%ld] v[%ld]\n",
+ buf, n, v));
+ 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) {
+ DEBUG(0,("invalid[%s] n[%lld] v[%lld]\n",
+ buf, 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.
+ */
+ DEBUG(0,("invalid[%s] n[%lld] v[%lld]\n",
+ buf, n, v));
+ return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
+ }
+
if (attr->rangeLower) {
if ((int64_t)v < (int64_t)*attr->rangeLower) {
return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
}
v = BVAL(in->value_ctr.values[i].blob->data, 0);
+ if (v == 0) {
+ /* special case for 1601 zero timestamp */
+ out->values[i] = data_blob_string_const("16010101000000.0Z");
+ continue;
+ }
v *= 10000000;
t = nt_time_to_unix(v);
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,
blobs[i] = data_blob_talloc(blobs, NULL, 8);
W_ERROR_HAVE_NO_MEMORY(blobs[i].data);
+ if (ldb_val_string_cmp(&in->values[i], "16010101000000.0Z") == 0) {
+ SBVALS(blobs[i].data, 0, 0);
+ continue;
+ }
+
t = ldb_string_utc_to_time((const char *)in->values[i].data);
unix_to_nt_time(&v, t);
v /= 10000000;
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++) {
}
memcpy(buf, in->values[i].data, in->values[i].length);
- errno = 0;
t = ldb_string_utc_to_time(buf);
- if (errno != 0) {
+ if (t == 0) {
return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
}
}
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;
}
}
}
v = BVAL(in->value_ctr.values[i].blob->data, 0);
+ if (v == 0) {
+ /* special case for 1601 zero timestamp */
+ out->values[i] = data_blob_string_const("16010101000000.0Z");
+ continue;
+ }
v *= 10000000;
t = nt_time_to_unix(v);
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,
blobs[i] = data_blob_talloc(blobs, NULL, 8);
W_ERROR_HAVE_NO_MEMORY(blobs[i].data);
+ if (ldb_val_string_cmp(&in->values[i], "16010101000000.0Z") == 0) {
+ SBVALS(blobs[i].data, 0, 0);
+ continue;
+ }
+
ret = ldb_val_to_time(&in->values[i], &t);
if (ret != LDB_SUCCESS) {
return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
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;
}
}
}
out->values[i] = data_blob_dup_talloc(out->values,
- in->value_ctr.values[i].blob);
+ *in->value_ctr.values[i].blob);
W_ERROR_HAVE_NO_MEMORY(out->values[i].data);
}
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,
for (i=0; i < in->num_values; i++) {
out->value_ctr.values[i].blob = &blobs[i];
- blobs[i] = data_blob_dup_talloc(blobs, &in->values[i]);
+ blobs[i] = data_blob_dup_talloc(blobs, in->values[i]);
W_ERROR_HAVE_NO_MEMORY(blobs[i].data);
}
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)) {
+ DEBUG(1,(__location__ ": Failed to map remote ATTID to local ATTID!\n"));
+ return WERR_FOOBAR;
+ }
c = dsdb_class_by_governsID_id(ctx->schema, v);
if (!c) {
- 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;
if (in->value_ctr.values[i].blob == NULL) {
+ DEBUG(0, ("Attribute has no value\n"));
return WERR_FOOBAR;
}
if (in->value_ctr.values[i].blob->length != 4) {
+ DEBUG(0, ("Attribute has a value with 0 length\n"));
return WERR_FOOBAR;
}
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)) {
+ DEBUG(1,(__location__ ": Failed to map remote ATTID to local ATTID!\n"));
+ return WERR_FOOBAR;
+ }
a = dsdb_attribute_by_attributeID_id(ctx->schema, v);
if (!a) {
- 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 ldb_message_element *out)
{
unsigned int i;
+ const struct dsdb_schema_prefixmap *prefixmap;
- SMB_ASSERT(ctx->pfm_remote);
+ if (ctx->pfm_remote != NULL) {
+ prefixmap = ctx->pfm_remote;
+ } else {
+ prefixmap = ctx->schema->prefixmap;
+ }
+ SMB_ASSERT(prefixmap);
out->flags = 0;
out->name = talloc_strdup(mem_ctx, attr->lDAPDisplayName);
attid = IVAL(in->value_ctr.values[i].blob->data, 0);
- status = dsdb_schema_pfm_oid_from_attid(ctx->pfm_remote, attid,
+ status = dsdb_schema_pfm_oid_from_attid(prefixmap, attid,
out->values, &oid);
- W_ERROR_NOT_OK_RETURN(status);
+ if (!W_ERROR_IS_OK(status)) {
+ DEBUG(0,(__location__ ": Error: Unknown ATTID 0x%08X\n",
+ attid));
+ return status;
+ }
out->values[i] = data_blob_string_const(oid);
}
obj_attr = dsdb_attribute_by_lDAPDisplayName(ctx->schema, (const char *)in->values[i].data);
if (!obj_attr) {
+ DEBUG(0, ("Unable to find attribute %s in the schema\n", (const char *)in->values[i].data));
return WERR_FOOBAR;
}
SIVAL(blobs[i].data, 0, obj_attr->attributeID_id);
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) {
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 (in->values[i].length == 0) {
+ talloc_free(tmp_ctx);
+ return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
+ }
+
if (!ber_write_OID_String(tmp_ctx, &blob, oid)) {
DEBUG(0,("ber_write_OID_String() failed for %s\n", oid));
talloc_free(tmp_ctx);
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) {
W_ERROR_HAVE_NO_MEMORY(out->values);
for (i=0; i < out->num_values; i++) {
+ size_t converted_size = 0;
char *str;
if (in->value_ctr.values[i].blob == NULL) {
CH_UTF16, CH_UNIX,
in->value_ctr.values[i].blob->data,
in->value_ctr.values[i].blob->length,
- (void **)&str, NULL, false)) {
+ (void **)&str, &converted_size)) {
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,
if (!convert_string_talloc(blobs,
CH_UNIX, CH_UTF16,
in->values[i].data, in->values[i].length,
- (void **)&blobs[i].data, &blobs[i].length, false)) {
+ (void **)&blobs[i].data, &blobs[i].length)) {
return WERR_FOOBAR;
}
}
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,
val->data,
val->length,
(void **)&dst,
- &size, false);
+ &size);
TALLOC_FREE(dst);
if (!ok) {
return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
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++) {
W_ERROR_HAVE_NO_MEMORY(dn);
}
- status = GUID_to_ndr_blob(&id3.guid, tmp_ctx, &guid_blob);
- if (!NT_STATUS_IS_OK(status)) {
- talloc_free(tmp_ctx);
- return ntstatus_to_werror(status);
- }
+ if (!GUID_all_zero(&id3.guid)) {
+ status = GUID_to_ndr_blob(&id3.guid, tmp_ctx, &guid_blob);
+ if (!NT_STATUS_IS_OK(status)) {
+ talloc_free(tmp_ctx);
+ return ntstatus_to_werror(status);
+ }
- ret = ldb_dn_set_extended_component(dn, "GUID", &guid_blob);
- if (ret != LDB_SUCCESS) {
- talloc_free(tmp_ctx);
- return WERR_FOOBAR;
+ ret = ldb_dn_set_extended_component(dn, "GUID", &guid_blob);
+ if (ret != LDB_SUCCESS) {
+ talloc_free(tmp_ctx);
+ return WERR_FOOBAR;
+ }
+ talloc_free(guid_blob.data);
}
- talloc_free(guid_blob.data);
-
if (id3.__ndr_size_sid) {
DATA_BLOB sid_blob;
ndr_err = ndr_push_struct_blob(&sid_blob, tmp_ctx, &id3.sid,
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++) {
for (i=0; i < out->num_values; i++) {
size_t len;
+ size_t converted_size = 0;
char *str;
if (in->value_ctr.values[i].blob == NULL) {
if (!convert_string_talloc(out->values, CH_UTF16, CH_UNIX,
in->value_ctr.values[i].blob->data+4,
in->value_ctr.values[i].blob->length-4,
- (void **)&str, NULL, false)) {
+ (void **)&str, &converted_size)) {
return WERR_FOOBAR;
}
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,
if (!convert_string_talloc(blobs, CH_UNIX, CH_UTF16,
in->values[i].data,
in->values[i].length,
- (void **)&data, &ret, false)) {
+ (void **)&data, &ret)) {
return WERR_FOOBAR;
}
.ldb_to_drsuapi = dsdb_syntax_BOOL_ldb_to_drsuapi,
.validate_ldb = dsdb_syntax_BOOL_validate_ldb,
.equality = "booleanMatch",
- .comment = "Boolean"
+ .comment = "Boolean",
+ .auto_normalise = true
},{
.name = "Integer",
.ldap_oid = LDB_SYNTAX_INTEGER,
.validate_ldb = dsdb_syntax_INT32_validate_ldb,
.equality = "integerMatch",
.comment = "Integer",
- .ldb_syntax = LDB_SYNTAX_SAMBA_INT32
+ .ldb_syntax = LDB_SYNTAX_SAMBA_INT32,
+ .auto_normalise = true
},{
.name = "String(Octet)",
.ldap_oid = LDB_SYNTAX_OCTET_STRING,
.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_INT32_drsuapi_to_ldb,
.ldb_to_drsuapi = dsdb_syntax_INT32_ldb_to_drsuapi,
.validate_ldb = dsdb_syntax_INT32_validate_ldb,
- .ldb_syntax = LDB_SYNTAX_SAMBA_INT32
+ .ldb_syntax = LDB_SYNTAX_SAMBA_INT32,
+ .auto_normalise = true
},{
/* not used in w2k3 forest */
.name = "String(Numeric)",
.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_UTC_validate_ldb,
.equality = "generalizedTimeMatch",
.comment = "UTC Time",
+ .auto_normalise = true
},{
.name = "String(Generalized-Time)",
.ldap_oid = "1.3.6.1.4.1.1466.115.121.1.24",
.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 */
.name = "String(Case Sensitive)",
* 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,
.equality = "integerMatch",
.comment = "Large Integer",
.ldb_syntax = LDB_SYNTAX_INTEGER,
+ .auto_normalise = true
},{
.name = "String(NT-Sec-Desc)",
.ldap_oid = LDB_SYNTAX_SAMBA_SECURITY_DESCRIPTOR,
},{
/* 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_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;
+ uint32_t attid_local;
+ bool ok;
+
+ if (ctx->pfm_remote == NULL) {
+ smb_panic(__location__);
+ }
+
+ switch (dsdb_pfm_get_attid_type(remote_attid_as_enum)) {
+ case DSDB_ATTID_TYPE_PFM:
+ /* map remote ATTID to local ATTID */
+ 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",
+ 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 = remote_attid_as_enum;
+ break;
+ default:
+ /* we should never get here */
+ DEBUG(0,(__location__ ": Invalid ATTID type passed for conversion - 0x%08X\n",
+ remote_attid_as_enum));
+ TALLOC_FREE(frame);
+ return WERR_INVALID_PARAMETER;
+ }
+
+ sa = dsdb_attribute_by_attributeID_id(ctx->schema, attid_local);
+ if (!sa) {
+ 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)
+ struct ldb_message_element *out,
+ enum drsuapi_DsAttributeId *local_attid_as_enum)
{
- const struct dsdb_attribute *sa;
struct dsdb_syntax_ctx syntax_ctx;
-
- sa = dsdb_attribute_by_attributeID_id(schema, in->attid);
- if (!sa) {
- return WERR_FOOBAR;
- }
+ 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