s4-dsdb: update callers to dsdb_convert_object_ex()

diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index efbcd8af6814c963f48f18546975fb68e6a5a4ba..ef531a43d27135a3ed1006d4b770b02923e9a499 100644 (file)
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -358,6 +358,7 @@ static NTSTATUS libnet_vampire_cb_apply_schema(struct libnet_vampire_cb_state *s
                        status = dsdb_convert_object_ex(s->ldb, working_schema, pfm_remote,
                                                        cur, c->gensec_skey,
                                                        ignore_attids,
                        status = dsdb_convert_object_ex(s->ldb, working_schema, pfm_remote,
                                                        cur, c->gensec_skey,
                                                        ignore_attids,

+                                                       0,

                                                        tmp_ctx, &object);
                        if (!W_ERROR_IS_OK(status)) {
                                DEBUG(1,("Warning: Failed to convert schema object %s into ldb msg\n",
                                                        tmp_ctx, &object);
                        if (!W_ERROR_IS_OK(status)) {
                                DEBUG(1,("Warning: Failed to convert schema object %s into ldb msg\n",


@@ -438,6 +439,7 @@ static NTSTATUS libnet_vampire_cb_apply_schema(struct libnet_vampire_cb_state *s
                                                 s_dsa,
                                                 uptodateness_vector,
                                                 c->gensec_skey,
                                                 s_dsa,
                                                 uptodateness_vector,
                                                 c->gensec_skey,

+                                                0,

                                                 s, &schema_objs);
        if (!W_ERROR_IS_OK(status)) {
                DEBUG(0,("Failed to convert objects when trying to import over DRS (2nd pass, to store remote schema): %s\n", win_errstr(status)));
                                                 s, &schema_objs);
        if (!W_ERROR_IS_OK(status)) {
                DEBUG(0,("Failed to convert objects when trying to import over DRS (2nd pass, to store remote schema): %s\n", win_errstr(status)));


@@ -743,6 +745,7 @@ NTSTATUS libnet_vampire_cb_store_chunk(void *private_data,
                                                 s_dsa,
                                                 uptodateness_vector,
                                                 c->gensec_skey,
                                                 s_dsa,
                                                 uptodateness_vector,
                                                 c->gensec_skey,

+                                                0,

                                                 s, &objs);
        if (!W_ERROR_IS_OK(status)) {
                DEBUG(0,("Failed to convert objects: %s\n", win_errstr(status)));
                                                 s, &objs);
        if (!W_ERROR_IS_OK(status)) {
                DEBUG(0,("Failed to convert objects: %s\n", win_errstr(status)));

diff --git a/source4/torture/drs/rpc/dssync.c b/source4/torture/drs/rpc/dssync.c
index 7149da4a856c3638c7c5269f3fed5a5c3179a11f..f6cc0f1026bc955d7b709c85a28bc9a6a566a58b 100644 (file)
--- a/source4/torture/drs/rpc/dssync.c
+++ b/source4/torture/drs/rpc/dssync.c
@@ -347,6 +347,7 @@ static bool test_analyse_objects(struct torture_context *tctx,
                                                 0, NULL,
                                                 NULL, NULL,
                                                 gensec_skey,
                                                 0, NULL,
                                                 NULL, NULL,
                                                 gensec_skey,

+                                                0,

                                                 ctx, &objs);
        torture_assert_werr_ok(tctx, status, "dsdb_extended_replicated_objects_convert() failed!");
 
                                                 ctx, &objs);
        torture_assert_werr_ok(tctx, status, "dsdb_extended_replicated_objects_convert() failed!");