s4:provision - Removed dependency on full Samba 3 schema from FDS
[samba.git] / source4 / lib / ldb-samba / ldif_handlers.c
index 5ab31d771bd6a753098d5f47323eb17682116b08..a74687173adfd74bc7f4b98bb4bd746e48ed3017 100644 (file)
@@ -2,7 +2,8 @@
    ldb database library - ldif handlers for Samba
 
    Copyright (C) Andrew Tridgell 2005
-   Copyright (C) Andrew Bartlett 2006-2007
+   Copyright (C) Andrew Bartlett 2006-2009
+   Copyright (C) Matthias Dieter Wallnöfer 2009
      ** NOTE! The following LGPL license applies to the ldb
      ** library. This does NOT imply that all of Samba is released
      ** under the LGPL
 */
 
 #include "includes.h"
-#include "lib/ldb/include/ldb_includes.h"
+#include "lib/ldb/include/ldb.h"
+#include "lib/ldb/include/ldb_module.h"
+#include "ldb_handlers.h"
 #include "dsdb/samdb/samdb.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
+#include "librpc/ndr/libndr.h"
 #include "libcli/security/security.h"
 #include "param/param.h"
+#include "../lib/util/asn1.h"
+
+/*
+  use ndr_print_* to convert a NDR formatted blob to a ldif formatted blob
+*/
+static int ldif_write_NDR(struct ldb_context *ldb, void *mem_ctx,
+                         const struct ldb_val *in, struct ldb_val *out,
+                         size_t struct_size,
+                         ndr_pull_flags_fn_t pull_fn,
+                         ndr_print_fn_t print_fn)
+{
+       uint8_t *p;
+       enum ndr_err_code err;
+       if (!(ldb_get_flags(ldb) & LDB_FLG_SHOW_BINARY)) {
+               return ldb_handler_copy(ldb, mem_ctx, in, out);
+       }
+       p = talloc_size(mem_ctx, struct_size);
+       err = ndr_pull_struct_blob(in, mem_ctx, 
+                                  lp_iconv_convenience(ldb_get_opaque(ldb, "loadparm")), 
+                                  p, pull_fn);
+       if (err != NDR_ERR_SUCCESS) {
+               talloc_free(p);
+               out->data = (uint8_t *)talloc_strdup(mem_ctx, "<Unable to decode binary data>");
+               out->length = strlen((const char *)out->data);
+               return 0;
+       }
+       out->data = (uint8_t *)ndr_print_struct_string(mem_ctx, print_fn, "NDR", p);
+       talloc_free(p);
+       if (out->data == NULL) {
+               return ldb_handler_copy(ldb, mem_ctx, in, out);         
+       }
+       out->length = strlen((char *)out->data);
+       return 0;
+}
 
 /*
   convert a ldif formatted objectSid to a NDR formatted blob
@@ -54,7 +92,7 @@ static int ldif_read_objectSid(struct ldb_context *ldb, void *mem_ctx,
 /*
   convert a NDR formatted blob to a ldif formatted objectSid
 */
-static int ldif_write_objectSid(struct ldb_context *ldb, void *mem_ctx,
+int ldif_write_objectSid(struct ldb_context *ldb, void *mem_ctx,
                                const struct ldb_val *in, struct ldb_val *out)
 {
        struct dom_sid *sid;
@@ -78,7 +116,7 @@ static int ldif_write_objectSid(struct ldb_context *ldb, void *mem_ctx,
        return 0;
 }
 
-static bool ldb_comparision_objectSid_isString(const struct ldb_val *v)
+bool ldif_comparision_objectSid_isString(const struct ldb_val *v)
 {
        if (v->length < 3) {
                return false;
@@ -92,13 +130,13 @@ static bool ldb_comparision_objectSid_isString(const struct ldb_val *v)
 /*
   compare two objectSids
 */
-static int ldb_comparison_objectSid(struct ldb_context *ldb, void *mem_ctx,
+static int ldif_comparison_objectSid(struct ldb_context *ldb, void *mem_ctx,
                                    const struct ldb_val *v1, const struct ldb_val *v2)
 {
-       if (ldb_comparision_objectSid_isString(v1) && ldb_comparision_objectSid_isString(v2)) {
+       if (ldif_comparision_objectSid_isString(v1) && ldif_comparision_objectSid_isString(v2)) {
                return ldb_comparison_binary(ldb, mem_ctx, v1, v2);
-       } else if (ldb_comparision_objectSid_isString(v1)
-                  && !ldb_comparision_objectSid_isString(v2)) {
+       } else if (ldif_comparision_objectSid_isString(v1)
+                  && !ldif_comparision_objectSid_isString(v2)) {
                struct ldb_val v;
                int ret;
                if (ldif_read_objectSid(ldb, mem_ctx, v1, &v) != 0) {
@@ -108,8 +146,8 @@ static int ldb_comparison_objectSid(struct ldb_context *ldb, void *mem_ctx,
                ret = ldb_comparison_binary(ldb, mem_ctx, &v, v2);
                talloc_free(v.data);
                return ret;
-       } else if (!ldb_comparision_objectSid_isString(v1)
-                  && ldb_comparision_objectSid_isString(v2)) {
+       } else if (!ldif_comparision_objectSid_isString(v1)
+                  && ldif_comparision_objectSid_isString(v2)) {
                struct ldb_val v;
                int ret;
                if (ldif_read_objectSid(ldb, mem_ctx, v2, &v) != 0) {
@@ -126,10 +164,10 @@ static int ldb_comparison_objectSid(struct ldb_context *ldb, void *mem_ctx,
 /*
   canonicalise a objectSid
 */
-static int ldb_canonicalise_objectSid(struct ldb_context *ldb, void *mem_ctx,
+static int ldif_canonicalise_objectSid(struct ldb_context *ldb, void *mem_ctx,
                                      const struct ldb_val *in, struct ldb_val *out)
 {
-       if (ldb_comparision_objectSid_isString(in)) {
+       if (ldif_comparision_objectSid_isString(in)) {
                if (ldif_read_objectSid(ldb, mem_ctx, in, out) != 0) {
                        /* Perhaps not a string after all */
                        return ldb_handler_copy(ldb, mem_ctx, in, out);
@@ -144,7 +182,7 @@ static int extended_dn_read_SID(struct ldb_context *ldb, void *mem_ctx,
 {
        struct dom_sid sid;
        enum ndr_err_code ndr_err;
-       if (ldb_comparision_objectSid_isString(in)) {
+       if (ldif_comparision_objectSid_isString(in)) {
                if (ldif_read_objectSid(ldb, mem_ctx, in, out) == 0) {
                        return 0;
                }
@@ -213,7 +251,7 @@ static int ldif_write_objectGUID(struct ldb_context *ldb, void *mem_ctx,
        return 0;
 }
 
-static bool ldb_comparision_objectGUID_isString(const struct ldb_val *v)
+static bool ldif_comparision_objectGUID_isString(const struct ldb_val *v)
 {
        if (v->length != 36 && v->length != 38) return false;
 
@@ -256,13 +294,13 @@ static int extended_dn_read_GUID(struct ldb_context *ldb, void *mem_ctx,
 /*
   compare two objectGUIDs
 */
-static int ldb_comparison_objectGUID(struct ldb_context *ldb, void *mem_ctx,
+static int ldif_comparison_objectGUID(struct ldb_context *ldb, void *mem_ctx,
                                     const struct ldb_val *v1, const struct ldb_val *v2)
 {
-       if (ldb_comparision_objectGUID_isString(v1) && ldb_comparision_objectGUID_isString(v2)) {
+       if (ldif_comparision_objectGUID_isString(v1) && ldif_comparision_objectGUID_isString(v2)) {
                return ldb_comparison_binary(ldb, mem_ctx, v1, v2);
-       } else if (ldb_comparision_objectGUID_isString(v1)
-                  && !ldb_comparision_objectGUID_isString(v2)) {
+       } else if (ldif_comparision_objectGUID_isString(v1)
+                  && !ldif_comparision_objectGUID_isString(v2)) {
                struct ldb_val v;
                int ret;
                if (ldif_read_objectGUID(ldb, mem_ctx, v1, &v) != 0) {
@@ -272,8 +310,8 @@ static int ldb_comparison_objectGUID(struct ldb_context *ldb, void *mem_ctx,
                ret = ldb_comparison_binary(ldb, mem_ctx, &v, v2);
                talloc_free(v.data);
                return ret;
-       } else if (!ldb_comparision_objectGUID_isString(v1)
-                  && ldb_comparision_objectGUID_isString(v2)) {
+       } else if (!ldif_comparision_objectGUID_isString(v1)
+                  && ldif_comparision_objectGUID_isString(v2)) {
                struct ldb_val v;
                int ret;
                if (ldif_read_objectGUID(ldb, mem_ctx, v2, &v) != 0) {
@@ -290,10 +328,10 @@ static int ldb_comparison_objectGUID(struct ldb_context *ldb, void *mem_ctx,
 /*
   canonicalise a objectGUID
 */
-static int ldb_canonicalise_objectGUID(struct ldb_context *ldb, void *mem_ctx,
+static int ldif_canonicalise_objectGUID(struct ldb_context *ldb, void *mem_ctx,
                                       const struct ldb_val *in, struct ldb_val *out)
 {
-       if (ldb_comparision_objectGUID_isString(in)) {
+       if (ldif_comparision_objectGUID_isString(in)) {
                if (ldif_read_objectGUID(ldb, mem_ctx, in, out) != 0) {
                        /* Perhaps it wasn't a valid string after all */
                        return ldb_handler_copy(ldb, mem_ctx, in, out);
@@ -313,16 +351,31 @@ static int ldif_read_ntSecurityDescriptor(struct ldb_context *ldb, void *mem_ctx
        struct security_descriptor *sd;
        enum ndr_err_code ndr_err;
 
-       sd = sddl_decode(mem_ctx, (const char *)in->data, NULL);
+       sd = talloc(mem_ctx, struct security_descriptor);
        if (sd == NULL) {
                return -1;
        }
+
+       ndr_err = ndr_pull_struct_blob(in, sd, NULL, sd,
+                                      (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               /* If this does not parse, then it is probably SDDL, and we should try it that way */
+               
+               const struct dom_sid *sid = samdb_domain_sid(ldb);
+               talloc_free(sd);
+               sd = sddl_decode(mem_ctx, (const char *)in->data, sid);
+               if (sd == NULL) {
+                       return -1;
+               }
+       }
+
        ndr_err = ndr_push_struct_blob(out, mem_ctx, NULL, sd,
                                       (ndr_push_flags_fn_t)ndr_push_security_descriptor);
        talloc_free(sd);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                return -1;
        }
+
        return 0;
 }
 
@@ -335,6 +388,14 @@ static int ldif_write_ntSecurityDescriptor(struct ldb_context *ldb, void *mem_ct
        struct security_descriptor *sd;
        enum ndr_err_code ndr_err;
 
+       if (ldb_get_flags(ldb) & LDB_FLG_SHOW_BINARY) {
+               return ldif_write_NDR(ldb, mem_ctx, in, out, 
+                                     sizeof(struct security_descriptor),
+                                     (ndr_pull_flags_fn_t)ndr_pull_security_descriptor,
+                                     (ndr_print_fn_t)ndr_print_security_descriptor);
+                                     
+       }
+
        sd = talloc(mem_ctx, struct security_descriptor);
        if (sd == NULL) {
                return -1;
@@ -365,13 +426,14 @@ static int ldif_canonicalise_objectCategory(struct ldb_context *ldb, void *mem_c
 {
        struct ldb_dn *dn1 = NULL;
        const struct dsdb_schema *schema = dsdb_get_schema(ldb);
-       const struct dsdb_class *class;
+       const struct dsdb_class *sclass;
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
        if (!tmp_ctx) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
        if (!schema) {
+               talloc_free(tmp_ctx);
                *out = data_blob_talloc(mem_ctx, in->data, in->length);
                if (in->data && !out->data) {
                        return LDB_ERR_OPERATIONS_ERROR;
@@ -381,10 +443,10 @@ static int ldif_canonicalise_objectCategory(struct ldb_context *ldb, void *mem_c
        dn1 = ldb_dn_from_ldb_val(tmp_ctx, ldb, in);
        if ( ! ldb_dn_validate(dn1)) {
                const char *lDAPDisplayName = talloc_strndup(tmp_ctx, (char *)in->data, in->length);
-               class = dsdb_class_by_lDAPDisplayName(schema, lDAPDisplayName);
-               if (class) {
+               sclass = dsdb_class_by_lDAPDisplayName(schema, lDAPDisplayName);
+               if (sclass) {
                        struct ldb_dn *dn = ldb_dn_new(mem_ctx, ldb,  
-                                                      class->defaultObjectCategory);
+                                                      sclass->defaultObjectCategory);
                        *out = data_blob_string_const(ldb_dn_alloc_casefold(mem_ctx, dn));
                        talloc_free(tmp_ctx);
 
@@ -415,26 +477,8 @@ static int ldif_comparison_objectCategory(struct ldb_context *ldb, void *mem_ctx
                                          const struct ldb_val *v1,
                                          const struct ldb_val *v2)
 {
-
-       int ret, ret1, ret2;
-       struct ldb_val v1_canon, v2_canon;
-       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
-
-       /* I could try and bail if tmp_ctx was NULL, but what return
-        * value would I use?
-        *
-        * It seems easier to continue on the NULL context 
-        */
-       ret1 = ldif_canonicalise_objectCategory(ldb, tmp_ctx, v1, &v1_canon);
-       ret2 = ldif_canonicalise_objectCategory(ldb, tmp_ctx, v2, &v2_canon);
-
-       if (ret1 == LDB_SUCCESS && ret2 == LDB_SUCCESS) {
-               ret = data_blob_cmp(&v1_canon, &v2_canon);
-       } else {
-               ret = data_blob_cmp(v1, v2);
-       }
-       talloc_free(tmp_ctx);
-       return ret;
+       return ldb_any_comparison(ldb, mem_ctx, ldif_canonicalise_objectCategory,
+                                 v1, v2);
 }
 
 /*
@@ -446,6 +490,7 @@ static int ldif_read_prefixMap(struct ldb_context *ldb, void *mem_ctx,
        struct prefixMapBlob *blob;
        enum ndr_err_code ndr_err;
        char *string, *line, *p, *oid;
+       DATA_BLOB oid_blob;
 
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
 
@@ -502,8 +547,12 @@ static int ldif_read_prefixMap(struct ldb_context *ldb, void *mem_ctx,
                /* we know there must be at least ":" */
                oid++;
 
-               blob->ctr.dsdb.mappings[blob->ctr.dsdb.num_mappings].oid.oid
-                       = talloc_strdup(blob->ctr.dsdb.mappings, oid);
+               if (!ber_write_partial_OID_String(blob->ctr.dsdb.mappings, &oid_blob, oid)) {
+                       talloc_free(tmp_ctx);
+                       return -1;
+               }
+               blob->ctr.dsdb.mappings[blob->ctr.dsdb.num_mappings].oid.length = oid_blob.length;
+               blob->ctr.dsdb.mappings[blob->ctr.dsdb.num_mappings].oid.binary_oid = oid_blob.data;
 
                blob->ctr.dsdb.num_mappings++;
 
@@ -537,6 +586,14 @@ static int ldif_write_prefixMap(struct ldb_context *ldb, void *mem_ctx,
        char *string;
        uint32_t i;
 
+       if (ldb_get_flags(ldb) & LDB_FLG_SHOW_BINARY) {
+               return ldif_write_NDR(ldb, mem_ctx, in, out, 
+                                     sizeof(struct prefixMapBlob),
+                                     (ndr_pull_flags_fn_t)ndr_pull_prefixMapBlob,
+                                     (ndr_print_fn_t)ndr_print_prefixMapBlob);
+                                     
+       }
+
        blob = talloc(mem_ctx, struct prefixMapBlob);
        if (blob == NULL) {
                return -1;
@@ -546,32 +603,47 @@ static int ldif_write_prefixMap(struct ldb_context *ldb, void *mem_ctx,
                                           blob,
                                           (ndr_pull_flags_fn_t)ndr_pull_prefixMapBlob);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               talloc_free(blob);
-               return -1;
+               goto failed;
        }
        if (blob->version != PREFIX_MAP_VERSION_DSDB) {
-               return -1;
+               goto failed;
        }
        string = talloc_strdup(mem_ctx, "");
        if (string == NULL) {
-               return -1;
+               goto failed;
        }
 
        for (i=0; i < blob->ctr.dsdb.num_mappings; i++) {
+               DATA_BLOB oid_blob;
+               const char *partial_oid = NULL;
+
                if (i > 0) {
                        string = talloc_asprintf_append(string, ";"); 
                }
+
+               oid_blob = data_blob_const(blob->ctr.dsdb.mappings[i].oid.binary_oid,
+                                          blob->ctr.dsdb.mappings[i].oid.length);
+               if (!ber_read_partial_OID_String(blob, oid_blob, &partial_oid)) {
+                       DEBUG(0, ("ber_read_partial_OID failed on prefixMap item with id: 0x%X",
+                                 blob->ctr.dsdb.mappings[i].id_prefix));
+                       goto failed;
+               }
                string = talloc_asprintf_append(string, "%u:%s", 
                                                   blob->ctr.dsdb.mappings[i].id_prefix,
-                                                  blob->ctr.dsdb.mappings[i].oid.oid);
+                                                  partial_oid);
+               talloc_free(discard_const(partial_oid));
                if (string == NULL) {
-                       return -1;
+                       goto failed;
                }
        }
 
        talloc_free(blob);
        *out = data_blob_string_const(string);
        return 0;
+
+failed:
+       talloc_free(blob);
+       return -1;
 }
 
 static bool ldif_comparision_prefixMap_isString(const struct ldb_val *v)
@@ -603,50 +675,93 @@ static int ldif_comparison_prefixMap(struct ldb_context *ldb, void *mem_ctx,
                                     const struct ldb_val *v1,
                                     const struct ldb_val *v2)
 {
+       return ldb_any_comparison(ldb, mem_ctx, ldif_canonicalise_prefixMap,
+                                 v1, v2);
+}
 
-       int ret, ret1, ret2;
-       struct ldb_val v1_canon, v2_canon;
-       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+/* Canonicalisation of two 32-bit integers */
+static int ldif_canonicalise_int32(struct ldb_context *ldb, void *mem_ctx,
+                       const struct ldb_val *in, struct ldb_val *out)
+{
+       char *end;
+       /* We've to use "strtoll" here to have the intended overflows.
+        * Otherwise we may get "LONG_MAX" and the conversion is wrong. */
+       int32_t i = (int32_t) strtoll((char *)in->data, &end, 0);
+       if (*end != 0) {
+               return -1;
+       }
+       out->data = (uint8_t *) talloc_asprintf(mem_ctx, "%d", i);
+       if (out->data == NULL) {
+               return -1;
+       }
+       out->length = strlen((char *)out->data);
+       return 0;
+}
 
-       /* I could try and bail if tmp_ctx was NULL, but what return
-        * value would I use?
-        *
-        * It seems easier to continue on the NULL context 
-        */
-       ret1 = ldif_canonicalise_prefixMap(ldb, tmp_ctx, v1, &v1_canon);
-       ret2 = ldif_canonicalise_prefixMap(ldb, tmp_ctx, v2, &v2_canon);
+/* Comparison of two 32-bit integers */
+static int ldif_comparison_int32(struct ldb_context *ldb, void *mem_ctx,
+                       const struct ldb_val *v1, const struct ldb_val *v2)
+{
+       /* We've to use "strtoll" here to have the intended overflows.
+        * Otherwise we may get "LONG_MAX" and the conversion is wrong. */
+       return (int32_t) strtoll((char *)v1->data, NULL, 0)
+        - (int32_t) strtoll((char *)v2->data, NULL, 0);
+}
 
-       if (ret1 == LDB_SUCCESS && ret2 == LDB_SUCCESS) {
-               ret = data_blob_cmp(&v1_canon, &v2_canon);
-       } else {
-               ret = data_blob_cmp(v1, v2);
-       }
-       talloc_free(tmp_ctx);
-       return ret;
+/*
+  convert a NDR formatted blob to a ldif formatted repsFromTo
+*/
+static int ldif_write_repsFromTo(struct ldb_context *ldb, void *mem_ctx,
+                                const struct ldb_val *in, struct ldb_val *out)
+{
+       return ldif_write_NDR(ldb, mem_ctx, in, out, 
+                             sizeof(struct repsFromToBlob),
+                             (ndr_pull_flags_fn_t)ndr_pull_repsFromToBlob,
+                             (ndr_print_fn_t)ndr_print_repsFromToBlob);
+}
+
+/*
+  convert a NDR formatted blob to a ldif formatted replPropertyMetaData
+*/
+static int ldif_write_replPropertyMetaData(struct ldb_context *ldb, void *mem_ctx,
+                                          const struct ldb_val *in, struct ldb_val *out)
+{
+       return ldif_write_NDR(ldb, mem_ctx, in, out, 
+                             sizeof(struct replPropertyMetaDataBlob),
+                             (ndr_pull_flags_fn_t)ndr_pull_replPropertyMetaDataBlob,
+                             (ndr_print_fn_t)ndr_print_replPropertyMetaDataBlob);
 }
 
+/*
+  convert a NDR formatted blob to a ldif formatted replUpToDateVector
+*/
+static int ldif_write_replUpToDateVector(struct ldb_context *ldb, void *mem_ctx,
+                                        const struct ldb_val *in, struct ldb_val *out)
+{
+       return ldif_write_NDR(ldb, mem_ctx, in, out, 
+                             sizeof(struct replUpToDateVectorBlob),
+                             (ndr_pull_flags_fn_t)ndr_pull_replUpToDateVectorBlob,
+                             (ndr_print_fn_t)ndr_print_replUpToDateVectorBlob);
+}
+
+
 static int extended_dn_write_hex(struct ldb_context *ldb, void *mem_ctx,
                                 const struct ldb_val *in, struct ldb_val *out)
 {
-       *out = data_blob_string_const(data_blob_hex_string(mem_ctx, in));
+       *out = data_blob_string_const(data_blob_hex_string_lower(mem_ctx, in));
        if (!out->data) {
                return -1;
        }
        return 0;
 }
 
-
-#define LDB_SYNTAX_SAMBA_GUID                  "LDB_SYNTAX_SAMBA_GUID"
-#define LDB_SYNTAX_SAMBA_OBJECT_CATEGORY       "LDB_SYNTAX_SAMBA_OBJECT_CATEGORY"
-#define LDB_SYNTAX_SAMBA_PREFIX_MAP    "LDB_SYNTAX_SAMBA_PREFIX_MAP"
-
 static const struct ldb_schema_syntax samba_syntaxes[] = {
        {
                .name             = LDB_SYNTAX_SAMBA_SID,
                .ldif_read_fn     = ldif_read_objectSid,
                .ldif_write_fn    = ldif_write_objectSid,
-               .canonicalise_fn  = ldb_canonicalise_objectSid,
-               .comparison_fn    = ldb_comparison_objectSid
+               .canonicalise_fn  = ldif_canonicalise_objectSid,
+               .comparison_fn    = ldif_comparison_objectSid
        },{
                .name             = LDB_SYNTAX_SAMBA_SECURITY_DESCRIPTOR,
                .ldif_read_fn     = ldif_read_ntSecurityDescriptor,
@@ -657,8 +772,8 @@ static const struct ldb_schema_syntax samba_syntaxes[] = {
                .name             = LDB_SYNTAX_SAMBA_GUID,
                .ldif_read_fn     = ldif_read_objectGUID,
                .ldif_write_fn    = ldif_write_objectGUID,
-               .canonicalise_fn  = ldb_canonicalise_objectGUID,
-               .comparison_fn    = ldb_comparison_objectGUID
+               .canonicalise_fn  = ldif_canonicalise_objectGUID,
+               .comparison_fn    = ldif_comparison_objectGUID
        },{
                .name             = LDB_SYNTAX_SAMBA_OBJECT_CATEGORY,
                .ldif_read_fn     = ldb_handler_copy,
@@ -671,7 +786,43 @@ static const struct ldb_schema_syntax samba_syntaxes[] = {
                .ldif_write_fn    = ldif_write_prefixMap,
                .canonicalise_fn  = ldif_canonicalise_prefixMap,
                .comparison_fn    = ldif_comparison_prefixMap
-       }
+       },{
+               .name             = LDB_SYNTAX_SAMBA_INT32,
+               .ldif_read_fn     = ldb_handler_copy,
+               .ldif_write_fn    = ldb_handler_copy,
+               .canonicalise_fn  = ldif_canonicalise_int32,
+               .comparison_fn    = ldif_comparison_int32
+       },{
+               .name             = LDB_SYNTAX_SAMBA_REPSFROMTO,
+               .ldif_read_fn     = ldb_handler_copy,
+               .ldif_write_fn    = ldif_write_repsFromTo,
+               .canonicalise_fn  = ldb_handler_copy,
+               .comparison_fn    = ldb_comparison_binary
+       },{
+               .name             = LDB_SYNTAX_SAMBA_REPLPROPERTYMETADATA,
+               .ldif_read_fn     = ldb_handler_copy,
+               .ldif_write_fn    = ldif_write_replPropertyMetaData,
+               .canonicalise_fn  = ldb_handler_copy,
+               .comparison_fn    = ldb_comparison_binary
+       },{
+               .name             = LDB_SYNTAX_SAMBA_REPLUPTODATEVECTOR,
+               .ldif_read_fn     = ldb_handler_copy,
+               .ldif_write_fn    = ldif_write_replUpToDateVector,
+               .canonicalise_fn  = ldb_handler_copy,
+               .comparison_fn    = ldb_comparison_binary
+       },{
+               .name             = DSDB_SYNTAX_BINARY_DN,
+               .ldif_read_fn     = ldb_handler_copy,
+               .ldif_write_fn    = ldb_handler_copy,
+               .canonicalise_fn  = dsdb_dn_binary_canonicalise,
+               .comparison_fn    = dsdb_dn_binary_comparison
+       },{
+               .name             = DSDB_SYNTAX_STRING_DN,
+               .ldif_read_fn     = ldb_handler_copy,
+               .ldif_write_fn    = ldb_handler_copy,
+               .canonicalise_fn  = dsdb_dn_string_canonicalise,
+               .comparison_fn    = dsdb_dn_string_comparison
+       },
 };
 
 static const struct ldb_dn_extended_syntax samba_dn_syntax[] = {
@@ -693,6 +844,7 @@ static const struct ldb_dn_extended_syntax samba_dn_syntax[] = {
        }
 };
 
+/* TODO: Should be dynamic at some point */
 static const struct {
        const char *name;
        const char *syntax;
@@ -703,6 +855,7 @@ static const struct {
        { "objectGUID",                 LDB_SYNTAX_SAMBA_GUID },
        { "invocationId",               LDB_SYNTAX_SAMBA_GUID },
        { "schemaIDGUID",               LDB_SYNTAX_SAMBA_GUID },
+       { "oMSyntax",                   LDB_SYNTAX_SAMBA_INT32 },
        { "attributeSecurityGUID",      LDB_SYNTAX_SAMBA_GUID },
        { "parentGUID",                 LDB_SYNTAX_SAMBA_GUID },
        { "siteGUID",                   LDB_SYNTAX_SAMBA_GUID },
@@ -711,7 +864,11 @@ static const struct {
        { "fRSReplicaSetGUID",          LDB_SYNTAX_SAMBA_GUID },
        { "netbootGUID",                LDB_SYNTAX_SAMBA_GUID },
        { "objectCategory",             LDB_SYNTAX_SAMBA_OBJECT_CATEGORY },
-       { "prefixMap",                  LDB_SYNTAX_SAMBA_PREFIX_MAP }
+       { "prefixMap",                  LDB_SYNTAX_SAMBA_PREFIX_MAP },
+       { "repsFrom",                   LDB_SYNTAX_SAMBA_REPSFROMTO },
+       { "repsTo",                     LDB_SYNTAX_SAMBA_REPSFROMTO },
+       { "replPropertyMetaData",       LDB_SYNTAX_SAMBA_REPLPROPERTYMETADATA },
+       { "replUpToDateVector",         LDB_SYNTAX_SAMBA_REPLUPTODATEVECTOR },
 };
 
 const struct ldb_schema_syntax *ldb_samba_syntax_by_name(struct ldb_context *ldb, const char *name)
@@ -728,6 +885,20 @@ const struct ldb_schema_syntax *ldb_samba_syntax_by_name(struct ldb_context *ldb
        return s;
 }
 
+const struct ldb_schema_syntax *ldb_samba_syntax_by_lDAPDisplayName(struct ldb_context *ldb, const char *name)
+{
+       uint32_t j;
+       const struct ldb_schema_syntax *s = NULL;
+
+       for (j=0; j < ARRAY_SIZE(samba_attributes); j++) {
+               if (strcmp(samba_attributes[j].name, name) == 0) {
+                       s = ldb_samba_syntax_by_name(ldb, samba_attributes[j].syntax);
+                       break;
+               }
+       }
+       
+       return s;
+}
 
 /*
   register the samba ldif handlers