s4-dsdb: add auto-normalisation of attributes

[amitay/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 a93cdfaaa913591b77d2e4d832ddfbfefae8ef58..501ab3adedbb28446900daecf4848f37e9a2de58 100644 (file)
--- a/source4/dsdb/schema/schema_syntax.c
+++ b/source4/dsdb/schema/schema_syntax.c
@@ -554,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);
 
@@ -607,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;
@@ -693,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);
 
@@ -739,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;
@@ -2345,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,
@@ -2356,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,
@@ -2397,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)",
@@ -2453,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",
@@ -2464,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)",
@@ -2502,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,