git.samba.org / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
s4-dsdb: add auto-normalisation of attributes
[samba.git] / source4 / dsdb / schema / schema_syntax.c
diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c
index 8d8be0495a720610eb252864d2fb49ed0cc26b3f..501ab3adedbb28446900daecf4848f37e9a2de58 100644 (file)
--- a/source4/dsdb/schema/schema_syntax.c
+++ b/source4/dsdb/schema/schema_syntax.c
@@ -25,8 +25,8 @@
 #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"
@@ -48,6 +48,8 @@ void dsdb_syntax_ctx_init(struct dsdb_syntax_ctx *ctx,
         * i.e. attributeID_id will be returned by default
         */
        ctx->is_schema_nc = true;
+
+       ctx->pfm_remote = NULL;
 }
 
 
@@ -68,6 +70,41 @@ uint32_t dsdb_attribute_get_attid(const struct dsdb_attribute *attr,
        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_make_attid(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,
@@ -171,7 +208,7 @@ static WERROR dsdb_syntax_BOOL_ldb_to_drsuapi(const struct dsdb_syntax_ctx *ctx,
        unsigned int i;
        DATA_BLOB *blobs;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -210,13 +247,17 @@ static WERROR dsdb_syntax_BOOL_validate_ldb(const struct dsdb_syntax_ctx *ctx,
 {
        unsigned int i;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
        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",
                            (const char *)in->values[i].data,
                            in->values[i].length);
@@ -280,7 +321,7 @@ static WERROR dsdb_syntax_INT32_ldb_to_drsuapi(const struct dsdb_syntax_ctx *ctx
        unsigned int i;
        DATA_BLOB *blobs;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -319,7 +360,7 @@ static WERROR dsdb_syntax_INT32_validate_ldb(const struct dsdb_syntax_ctx *ctx,
 {
        unsigned int i;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -407,7 +448,7 @@ static WERROR dsdb_syntax_INT64_ldb_to_drsuapi(const struct dsdb_syntax_ctx *ctx
        unsigned int i;
        DATA_BLOB *blobs;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -444,7 +485,7 @@ static WERROR dsdb_syntax_INT64_validate_ldb(const struct dsdb_syntax_ctx *ctx,
 {
        unsigned int i;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -513,6 +554,11 @@ static WERROR dsdb_syntax_NTTIME_UTC_drsuapi_to_ldb(const struct dsdb_syntax_ctx
                }
 
                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);
 
@@ -542,7 +588,7 @@ static WERROR dsdb_syntax_NTTIME_UTC_ldb_to_drsuapi(const struct dsdb_syntax_ctx
        unsigned int i;
        DATA_BLOB *blobs;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -566,6 +612,11 @@ static WERROR dsdb_syntax_NTTIME_UTC_ldb_to_drsuapi(const struct dsdb_syntax_ctx
                blobs[i] = data_blob_talloc(blobs, NULL, 8);
                W_ERROR_HAVE_NO_MEMORY(blobs[i].data);
 
+               if (ldb_val_string_cmp("16010101000000.0Z", &in->values[i]) == 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;
@@ -582,7 +633,7 @@ static WERROR dsdb_syntax_NTTIME_UTC_validate_ldb(const struct dsdb_syntax_ctx *
 {
        unsigned int i;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -596,9 +647,8 @@ static WERROR dsdb_syntax_NTTIME_UTC_validate_ldb(const struct dsdb_syntax_ctx *
                }
                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;
                }
 
@@ -653,6 +703,11 @@ static WERROR dsdb_syntax_NTTIME_drsuapi_to_ldb(const struct dsdb_syntax_ctx *ct
                }
 
                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);
 
@@ -674,7 +729,7 @@ static WERROR dsdb_syntax_NTTIME_ldb_to_drsuapi(const struct dsdb_syntax_ctx *ct
        unsigned int i;
        DATA_BLOB *blobs;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -699,6 +754,11 @@ static WERROR dsdb_syntax_NTTIME_ldb_to_drsuapi(const struct dsdb_syntax_ctx *ct
                blobs[i] = data_blob_talloc(blobs, NULL, 8);
                W_ERROR_HAVE_NO_MEMORY(blobs[i].data);
 
+               if (ldb_val_string_cmp("16010101000000.0Z", &in->values[i]) == 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;
@@ -718,7 +778,7 @@ static WERROR dsdb_syntax_NTTIME_validate_ldb(const struct dsdb_syntax_ctx *ctx,
 {
        unsigned int i;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -789,7 +849,7 @@ static WERROR dsdb_syntax_DATA_BLOB_ldb_to_drsuapi(const struct dsdb_syntax_ctx
        unsigned int i;
        DATA_BLOB *blobs;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -818,7 +878,7 @@ static WERROR dsdb_syntax_DATA_BLOB_validate_one_val(const struct dsdb_syntax_ct
                                                     const struct dsdb_attribute *attr,
                                                     const struct ldb_val *val)
 {
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -844,7 +904,7 @@ static WERROR dsdb_syntax_DATA_BLOB_validate_ldb(const struct dsdb_syntax_ctx *c
        unsigned int i;
        WERROR status;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -902,7 +962,9 @@ static WERROR _dsdb_syntax_auto_OID_drsuapi_to_ldb(const struct dsdb_syntax_ctx
                        str = talloc_strdup(out->values, a->lDAPDisplayName);
                } else {
                        WERROR werr;
-                       werr = dsdb_schema_pfm_oid_from_attid(ctx->schema->prefixmap, v, out->values, &str);
+                       SMB_ASSERT(ctx->pfm_remote);
+                       werr = dsdb_schema_pfm_oid_from_attid(ctx->pfm_remote, v,
+                                                             out->values, &str);
                        W_ERROR_NOT_OK_RETURN(werr);
                }
                W_ERROR_HAVE_NO_MEMORY(str);
@@ -945,8 +1007,15 @@ static WERROR _dsdb_syntax_OID_obj_drsuapi_to_ldb(const struct dsdb_syntax_ctx *
 
                v = IVAL(in->value_ctr.values[i].blob->data, 0);
 
+               /* 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) {
+                       DEBUG(1,(__location__ ": Unknown governsID 0x%08X\n", v));
                        return WERR_FOOBAR;
                }
 
@@ -991,8 +1060,15 @@ static WERROR _dsdb_syntax_OID_attr_drsuapi_to_ldb(const struct dsdb_syntax_ctx
 
                v = IVAL(in->value_ctr.values[i].blob->data, 0);
 
+               /* 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) {
+                       DEBUG(1,(__location__ ": Unknown attributeID_id 0x%08X\n", v));
                        return WERR_FOOBAR;
                }
 
@@ -1013,6 +1089,14 @@ static WERROR _dsdb_syntax_OID_oid_drsuapi_to_ldb(const struct dsdb_syntax_ctx *
                                                  struct ldb_message_element *out)
 {
        unsigned int i;
+       const struct dsdb_schema_prefixmap *prefixmap;
+
+       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);
@@ -1037,8 +1121,13 @@ static WERROR _dsdb_syntax_OID_oid_drsuapi_to_ldb(const struct dsdb_syntax_ctx *
 
                attid = IVAL(in->value_ctr.values[i].blob->data, 0);
 
-               status = dsdb_schema_pfm_oid_from_attid(ctx->schema->prefixmap, attid, out->values, &oid);
-               W_ERROR_NOT_OK_RETURN(status);
+               status = dsdb_schema_pfm_oid_from_attid(prefixmap, attid,
+                                                       out->values, &oid);
+               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);
        }
@@ -1273,7 +1362,7 @@ static WERROR dsdb_syntax_OID_ldb_to_drsuapi(const struct dsdb_syntax_ctx *ctx,
                                             TALLOC_CTX *mem_ctx,
                                             struct drsuapi_DsReplicaAttribute *out)
 {
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -1316,9 +1405,14 @@ 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 (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);
@@ -1351,7 +1445,7 @@ static WERROR dsdb_syntax_OID_validate_ldb(const struct dsdb_syntax_ctx *ctx,
        struct ldb_message_element ldb_tmp;
        TALLOC_CTX *tmp_ctx;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -1410,6 +1504,7 @@ static WERROR dsdb_syntax_UNICODE_drsuapi_to_ldb(const struct dsdb_syntax_ctx *c
        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) {
@@ -1424,7 +1519,7 @@ static WERROR dsdb_syntax_UNICODE_drsuapi_to_ldb(const struct dsdb_syntax_ctx *c
                                           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;
                }
 
@@ -1443,7 +1538,7 @@ static WERROR dsdb_syntax_UNICODE_ldb_to_drsuapi(const struct dsdb_syntax_ctx *c
        unsigned int i;
        DATA_BLOB *blobs;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -1464,7 +1559,7 @@ static WERROR dsdb_syntax_UNICODE_ldb_to_drsuapi(const struct dsdb_syntax_ctx *c
                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;
                }
        }
@@ -1480,7 +1575,7 @@ static WERROR dsdb_syntax_UNICODE_validate_one_val(const struct dsdb_syntax_ctx
        size_t size;
        bool ok;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -1489,7 +1584,7 @@ static WERROR dsdb_syntax_UNICODE_validate_one_val(const struct dsdb_syntax_ctx
                                   val->data,
                                   val->length,
                                   (void **)&dst,
-                                  &size, false);
+                                  &size);
        TALLOC_FREE(dst);
        if (!ok) {
                return WERR_DS_INVALID_ATTRIBUTE_SYNTAX;
@@ -1517,7 +1612,7 @@ static WERROR dsdb_syntax_UNICODE_validate_ldb(const struct dsdb_syntax_ctx *ctx
        WERROR status;
        unsigned int i;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -1656,7 +1751,7 @@ static WERROR dsdb_syntax_DN_ldb_to_drsuapi(const struct dsdb_syntax_ctx *ctx,
        unsigned int i;
        DATA_BLOB *blobs;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -1738,7 +1833,7 @@ static WERROR dsdb_syntax_DN_validate_one_val(const struct dsdb_syntax_ctx *ctx,
 
        W_ERROR_HAVE_NO_MEMORY(tmp_ctx);
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -1821,7 +1916,7 @@ static WERROR dsdb_syntax_DN_validate_ldb(const struct dsdb_syntax_ctx *ctx,
 {
        unsigned int i;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -1908,20 +2003,21 @@ static WERROR dsdb_syntax_DN_BINARY_drsuapi_to_ldb(const struct dsdb_syntax_ctx
                        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,
@@ -1962,7 +2058,7 @@ static WERROR dsdb_syntax_DN_BINARY_ldb_to_drsuapi(const struct dsdb_syntax_ctx
        unsigned int i;
        DATA_BLOB *blobs;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -2041,7 +2137,7 @@ static WERROR dsdb_syntax_DN_BINARY_validate_ldb(const struct dsdb_syntax_ctx *c
 {
        unsigned int i;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -2111,7 +2207,7 @@ static WERROR dsdb_syntax_DN_STRING_validate_ldb(const struct dsdb_syntax_ctx *c
 {
        unsigned int i;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -2167,6 +2263,7 @@ static WERROR dsdb_syntax_PRESENTATION_ADDRESS_drsuapi_to_ldb(const struct dsdb_
 
        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) {
@@ -2186,7 +2283,7 @@ static WERROR dsdb_syntax_PRESENTATION_ADDRESS_drsuapi_to_ldb(const struct dsdb_
                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;
                }
 
@@ -2205,7 +2302,7 @@ static WERROR dsdb_syntax_PRESENTATION_ADDRESS_ldb_to_drsuapi(const struct dsdb_
        unsigned int i;
        DATA_BLOB *blobs;
 
-       if (attr->attributeID_id == 0xFFFFFFFF) {
+       if (attr->attributeID_id == DRSUAPI_ATTID_INVALID) {
                return WERR_FOOBAR;
        }
 
@@ -2229,7 +2326,7 @@ static WERROR dsdb_syntax_PRESENTATION_ADDRESS_ldb_to_drsuapi(const struct dsdb_
                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;
                }
 
@@ -2268,7 +2365,8 @@ static const struct dsdb_syntax dsdb_syntaxes[] = {
                .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,
@@ -2279,7 +2377,8 @@ static const struct dsdb_syntax dsdb_syntaxes[] = {
                .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,
@@ -2320,7 +2419,8 @@ static const struct dsdb_syntax dsdb_syntaxes[] = {
                .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)",
@@ -2376,6 +2476,7 @@ static const struct dsdb_syntax dsdb_syntaxes[] = {
                .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",
@@ -2387,6 +2488,7 @@ static const struct dsdb_syntax dsdb_syntaxes[] = {
                .equality               = "generalizedTimeMatch",
                .comment                = "Generalized Time",
                .ldb_syntax             = LDB_SYNTAX_UTC_TIME,
+               .auto_normalise         = true
        },{
        /* not used in w2k3 schema */
                .name                   = "String(Case Sensitive)",
@@ -2425,6 +2527,7 @@ static const struct dsdb_syntax dsdb_syntaxes[] = {
                .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,
@@ -2579,21 +2682,45 @@ const struct dsdb_syntax *dsdb_syntax_for_attribute(const struct dsdb_attribute
 
 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)
 {
        const struct dsdb_attribute *sa;
        struct dsdb_syntax_ctx syntax_ctx;
+       uint32_t attid_local;
+
+       /* use default syntax conversion context */
+       dsdb_syntax_ctx_init(&syntax_ctx, ldb, schema);
+       syntax_ctx.pfm_remote = pfm_remote;
+
+       switch (dsdb_pfm_get_attid_type(in->attid)) {
+       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)) {
+                       DEBUG(0,(__location__ ": Can't find local ATTID for 0x%08X\n",
+                                in->attid));
+                       return WERR_FOOBAR;
+               }
+               break;
+       case DSDB_ATTID_TYPE_INTID:
+               /* use IntId value directly */
+               attid_local = in->attid;
+               break;
+       default:
+               /* we should never get here */
+               DEBUG(0,(__location__ ": Invalid ATTID type passed for conversion - 0x%08X\n",
+                        in->attid));
+               return WERR_INVALID_PARAMETER;
+       }
 
-       sa = dsdb_attribute_by_attributeID_id(schema, in->attid);
+       sa = dsdb_attribute_by_attributeID_id(schema, attid_local);
        if (!sa) {
+               DEBUG(1,(__location__ ": Unknown attributeID_id 0x%08X\n", in->attid));
                return WERR_FOOBAR;
        }
 
-       /* use default syntax conversion context */
-       dsdb_syntax_ctx_init(&syntax_ctx, ldb, schema);
-
        return sa->syntax->drsuapi_to_ldb(&syntax_ctx, sa, in, mem_ctx, out);
 }
 
Samba Shared Repository