s4-dsdb: use GUID_to_ndr_blob()

[ira/wip.git] / source4 / dsdb / samdb / ldb_modules / simple_ldap_map.c

diff --git a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 8d3c78d37fb8cea09c11f4104158081fc9b4d4f4..43402248c0ce0a737407172b18c1ca7e40dfb0c9 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@ -44,16 +44,14 @@ static struct ldb_val encode_guid(struct ldb_module *module, TALLOC_CTX *ctx, co
 {
        struct GUID guid;
        NTSTATUS status = GUID_from_data_blob(val, &guid);
-       enum ndr_err_code ndr_err;
        struct ldb_val out = data_blob(NULL, 0);
 
        if (!NT_STATUS_IS_OK(status)) {
                return out;
        }
-       ndr_err = ndr_push_struct_blob(&out, ctx, NULL, &guid,
-                                      (ndr_push_flags_fn_t)ndr_push_GUID);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return out;
+       status = GUID_to_ndr_blob(&guid, ctx, &out);
+       if (!NT_STATUS_IS_OK(status)) {
+               return data_blob(NULL, 0);
        }
 
        return out;
@@ -74,16 +72,14 @@ static struct ldb_val encode_ns_guid(struct ldb_module *module, TALLOC_CTX *ctx,
 {
        struct GUID guid;
        NTSTATUS status = NS_GUID_from_string((char *)val->data, &guid);
-       enum ndr_err_code ndr_err;
        struct ldb_val out = data_blob(NULL, 0);
 
        if (!NT_STATUS_IS_OK(status)) {
                return out;
        }
-       ndr_err = ndr_push_struct_blob(&out, ctx, NULL, &guid,
-                                      (ndr_push_flags_fn_t)ndr_push_GUID);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return out;
+       status = GUID_to_ndr_blob(&guid, ctx, &out);
+       if (!NT_STATUS_IS_OK(status)) {
+               return data_blob(NULL, 0);
        }
 
        return out;