s3-libnet-samsync: use samsync_ops.

Guenther

diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index 2e7063e4eaaa3335460360c25193eb2079ddfa0b..e57c2a5e1164643b30db1162ed660a0f3affe645 100644 (file)
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -408,9 +408,10 @@ static NTSTATUS libnet_samsync_delta(enum netr_SamDatabaseID database_id,
                                        delta_enum_array);
 
                /* Process results */
-               callback_status = ctx->delta_fn(mem_ctx, database_id,
-                                               delta_enum_array,
-                                               NT_STATUS_IS_OK(result), ctx);
+               callback_status = ctx->ops->process_objects(mem_ctx, database_id,
+                                                           delta_enum_array,
+                                                           NT_STATUS_IS_OK(result),
+                                                           ctx);
                if (!NT_STATUS_IS_OK(callback_status)) {
                        result = callback_status;
                        goto out;

diff --git a/source3/libnet/libnet_samsync.h b/source3/libnet/libnet_samsync.h
index 2f0f049fb90af5a224b953c9bd5b278f2b92e745..23a3746fc917c83d6e6a444b6c1ef043b60f9e7f 100644 (file)
--- a/source3/libnet/libnet_samsync.h
+++ b/source3/libnet/libnet_samsync.h
@@ -27,11 +27,6 @@ enum net_samsync_mode {
 
 struct samsync_context;
 
-typedef NTSTATUS (*samsync_delta_fn_t)(TALLOC_CTX *,
-                                      enum netr_SamDatabaseID,
-                                      struct netr_DELTA_ENUM_ARRAY *,
-                                      bool,
-                                      struct samsync_context *);
 struct samsync_ops {
        NTSTATUS (*startup)(TALLOC_CTX *mem_ctx,
                            struct samsync_context *ctx,
@@ -82,7 +77,6 @@ struct samsync_context {
 
        const struct samsync_ops *ops;
 
-       samsync_delta_fn_t delta_fn;
        void *private_data;
 };
 
@@ -90,24 +84,3 @@ extern const struct samsync_ops libnet_samsync_ldif_ops;
 extern const struct samsync_ops libnet_samsync_keytab_ops;
 extern const struct samsync_ops libnet_samsync_display_ops;
 extern const struct samsync_ops libnet_samsync_passdb_ops;
-
-NTSTATUS fetch_sam_entries_ldif(TALLOC_CTX *mem_ctx,
-                               enum netr_SamDatabaseID database_id,
-                               struct netr_DELTA_ENUM_ARRAY *r,
-                               bool last_query,
-                               struct samsync_context *ctx);
-NTSTATUS fetch_sam_entries(TALLOC_CTX *mem_ctx,
-                          enum netr_SamDatabaseID database_id,
-                          struct netr_DELTA_ENUM_ARRAY *r,
-                          bool last_query,
-                          struct samsync_context *ctx);
-NTSTATUS display_sam_entries(TALLOC_CTX *mem_ctx,
-                            enum netr_SamDatabaseID database_id,
-                            struct netr_DELTA_ENUM_ARRAY *r,
-                            bool last_query,
-                            struct samsync_context *ctx);
-NTSTATUS fetch_sam_entries_keytab(TALLOC_CTX *mem_ctx,
-                                 enum netr_SamDatabaseID database_id,
-                                 struct netr_DELTA_ENUM_ARRAY *r,
-                                 bool last_query,
-                                 struct samsync_context *ctx);

diff --git a/source3/libnet/libnet_samsync_display.c b/source3/libnet/libnet_samsync_display.c
index 5a0c3088cf757d5fe025ba0da5be056794cfaa05..5fdf327b741c319964d1de51083837c45889afc9 100644 (file)
--- a/source3/libnet/libnet_samsync_display.c
+++ b/source3/libnet/libnet_samsync_display.c
@@ -285,11 +285,11 @@ static NTSTATUS display_sam_entry(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-NTSTATUS display_sam_entries(TALLOC_CTX *mem_ctx,
-                            enum netr_SamDatabaseID database_id,
-                            struct netr_DELTA_ENUM_ARRAY *r,
-                            bool last_query,
-                            struct samsync_context *ctx)
+static NTSTATUS display_sam_entries(TALLOC_CTX *mem_ctx,
+                                   enum netr_SamDatabaseID database_id,
+                                   struct netr_DELTA_ENUM_ARRAY *r,
+                                   bool last_query,
+                                   struct samsync_context *ctx)
 {
        int i;
 

diff --git a/source3/libnet/libnet_samsync_keytab.c b/source3/libnet/libnet_samsync_keytab.c
index b68d70145cfb7099282edcb11298be7628069384..679f9df480277bb9f4e1d11c1bd6550fc57c6ec3 100644 (file)
--- a/source3/libnet/libnet_samsync_keytab.c
+++ b/source3/libnet/libnet_samsync_keytab.c
@@ -105,11 +105,11 @@ static NTSTATUS fetch_sam_entry_keytab(TALLOC_CTX *mem_ctx,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS fetch_sam_entries_keytab(TALLOC_CTX *mem_ctx,
-                                 enum netr_SamDatabaseID database_id,
-                                 struct netr_DELTA_ENUM_ARRAY *r,
-                                 bool last_query,
-                                 struct samsync_context *ctx)
+static NTSTATUS fetch_sam_entries_keytab(TALLOC_CTX *mem_ctx,
+                                        enum netr_SamDatabaseID database_id,
+                                        struct netr_DELTA_ENUM_ARRAY *r,
+                                        bool last_query,
+                                        struct samsync_context *ctx)
 {
        NTSTATUS status = NT_STATUS_OK;
        krb5_error_code ret = 0;
@@ -178,11 +178,11 @@ NTSTATUS fetch_sam_entries_keytab(TALLOC_CTX *mem_ctx,
 
 #else
 
-NTSTATUS fetch_sam_entries_keytab(TALLOC_CTX *mem_ctx,
-                                 enum netr_SamDatabaseID database_id,
-                                 struct netr_DELTA_ENUM_ARRAY *r,
-                                 bool last_query,
-                                 struct samsync_context *ctx)
+static NTSTATUS fetch_sam_entries_keytab(TALLOC_CTX *mem_ctx,
+                                        enum netr_SamDatabaseID database_id,
+                                        struct netr_DELTA_ENUM_ARRAY *r,
+                                        bool last_query,
+                                        struct samsync_context *ctx)
 {
        return NT_STATUS_NOT_SUPPORTED;
 }

diff --git a/source3/libnet/libnet_samsync_ldif.c b/source3/libnet/libnet_samsync_ldif.c
index 245ebe0b9f9407bb8c8555c4d6bd971f17c8edcb..7f794e7d8c6f48b60e49107b7826ff03edcac016 100644 (file)
--- a/source3/libnet/libnet_samsync_ldif.c
+++ b/source3/libnet/libnet_samsync_ldif.c
@@ -1156,11 +1156,11 @@ static NTSTATUS ldif_realloc_maps(TALLOC_CTX *mem_ctx,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS fetch_sam_entries_ldif(TALLOC_CTX *mem_ctx,
-                               enum netr_SamDatabaseID database_id,
-                               struct netr_DELTA_ENUM_ARRAY *r,
-                               bool last_query,
-                               struct samsync_context *ctx)
+static NTSTATUS fetch_sam_entries_ldif(TALLOC_CTX *mem_ctx,
+                                      enum netr_SamDatabaseID database_id,
+                                      struct netr_DELTA_ENUM_ARRAY *r,
+                                      bool last_query,
+                                      struct samsync_context *ctx)
 {
        NTSTATUS status;
        int i;
@@ -1216,11 +1216,11 @@ NTSTATUS fetch_sam_entries_ldif(TALLOC_CTX *mem_ctx,
 
 #else /* HAVE_LDAP */
 
-NTSTATUS fetch_sam_entries_ldif(TALLOC_CTX *mem_ctx,
-                               enum netr_SamDatabaseID database_id,
-                               struct netr_DELTA_ENUM_ARRAY *r,
-                               bool last_query,
-                               struct samsync_context *ctx)
+static NTSTATUS fetch_sam_entries_ldif(TALLOC_CTX *mem_ctx,
+                                      enum netr_SamDatabaseID database_id,
+                                      struct netr_DELTA_ENUM_ARRAY *r,
+                                      bool last_query,
+                                      struct samsync_context *ctx)
 {
        return NT_STATUS_NOT_SUPPORTED;
 }

diff --git a/source3/libnet/libnet_samsync_passdb.c b/source3/libnet/libnet_samsync_passdb.c
index 6e068e0f41d6bcc2e4a9fb454298b686d57575dc..10c7ff110f4032a8292c814db75098efa2569505 100644 (file)
--- a/source3/libnet/libnet_samsync_passdb.c
+++ b/source3/libnet/libnet_samsync_passdb.c
@@ -772,11 +772,11 @@ static NTSTATUS fetch_sam_entry(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-NTSTATUS fetch_sam_entries(TALLOC_CTX *mem_ctx,
-                          enum netr_SamDatabaseID database_id,
-                          struct netr_DELTA_ENUM_ARRAY *r,
-                          bool last_query,
-                          struct samsync_context *ctx)
+static NTSTATUS fetch_sam_entries(TALLOC_CTX *mem_ctx,
+                                 enum netr_SamDatabaseID database_id,
+                                 struct netr_DELTA_ENUM_ARRAY *r,
+                                 bool last_query,
+                                 struct samsync_context *ctx)
 {
        int i;
 

diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 3b977186345127b7aee185e2b57fbe53884575a4..6b23db74cba7d95f7bd8a0e1b05f19f9a35ba1b3 100644 (file)
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -123,7 +123,7 @@ NTSTATUS rpc_samdump_internals(struct net_context *c,
 
        ctx->mode               = NET_SAMSYNC_MODE_DUMP;
        ctx->cli                = pipe_hnd;
-       ctx->delta_fn           = display_sam_entries;
+       ctx->ops                = &libnet_samsync_display_ops;
        ctx->domain_name        = domain_name;
 
        ctx->force_full_replication = c->opt_force_full_repl ? true : false;
@@ -206,7 +206,7 @@ NTSTATUS rpc_vampire_internals(struct net_context *c,
 
        ctx->mode               = NET_SAMSYNC_MODE_FETCH_PASSDB;
        ctx->cli                = pipe_hnd;
-       ctx->delta_fn           = fetch_sam_entries;
+       ctx->ops                = &libnet_samsync_passdb_ops;
        ctx->domain_name        = domain_name;
 
        ctx->force_full_replication = c->opt_force_full_repl ? true : false;
@@ -292,7 +292,7 @@ NTSTATUS rpc_vampire_ldif_internals(struct net_context *c,
 
        ctx->mode               = NET_SAMSYNC_MODE_FETCH_LDIF;
        ctx->cli                = pipe_hnd;
-       ctx->delta_fn           = fetch_sam_entries_ldif;
+       ctx->ops                = &libnet_samsync_ldif_ops;
        ctx->domain_name        = domain_name;
 
        ctx->force_full_replication = c->opt_force_full_repl ? true : false;
@@ -377,7 +377,7 @@ NTSTATUS rpc_vampire_keytab_internals(struct net_context *c,
 
        ctx->mode               = NET_SAMSYNC_MODE_FETCH_KEYTAB;
        ctx->cli                = pipe_hnd;
-       ctx->delta_fn           = fetch_sam_entries_keytab;
+       ctx->ops                = &libnet_samsync_keytab_ops;
        ctx->domain_name        = domain_name;
        ctx->username           = c->opt_user_name;
        ctx->password           = c->opt_password;