[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-806-g264b28e

[Günther Deschner]

The branch, master has been updated
       via  264b28ec0962c355ee90f9ac67fcf07cd84c5c7b (commit)
      from  7ce1356c9f571c55af70bd6b966fe50898c1582d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 264b28ec0962c355ee90f9ac67fcf07cd84c5c7b
Author: Günther Deschner <g...@samba.org>
Date:   Wed Apr 1 16:55:53 2009 +0200

    s3-libnet: only call libnet_dssync_process() startup and shutdown callbacks 
when filled in.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/libnet/libnet_dssync.c |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libnet/libnet_dssync.c b/source3/libnet/libnet_dssync.c
index 81866c8..746b096 100644
--- a/source3/libnet/libnet_dssync.c
+++ b/source3/libnet/libnet_dssync.c
@@ -649,12 +649,14 @@ static NTSTATUS libnet_dssync_process(TALLOC_CTX *mem_ctx,
        uint32_t dn_count;
        uint32_t count;
 
-       status = ctx->ops->startup(ctx, mem_ctx, &old_utdv);
-       if (!NT_STATUS_IS_OK(status)) {
-               ctx->error_message = talloc_asprintf(ctx,
-                       "Failed to call startup operation: %s",
-                       nt_errstr(status));
-               goto out;
+       if (ctx->ops->startup) {
+               status = ctx->ops->startup(ctx, mem_ctx, &old_utdv);
+               if (!NT_STATUS_IS_OK(status)) {
+                       ctx->error_message = talloc_asprintf(ctx,
+                               "Failed to call startup operation: %s",
+                               nt_errstr(status));
+                       goto out;
+               }
        }
 
        if (ctx->single_object_replication && ctx->object_dns) {
@@ -684,12 +686,14 @@ static NTSTATUS libnet_dssync_process(TALLOC_CTX *mem_ctx,
                }
        }
 
-       status = ctx->ops->finish(ctx, mem_ctx, pnew_utdv);
-       if (!NT_STATUS_IS_OK(status)) {
-               ctx->error_message = talloc_asprintf(ctx,
-                       "Failed to call finishing operation: %s",
-                       nt_errstr(status));
-               goto out;
+       if (ctx->ops->finish) {
+               status = ctx->ops->finish(ctx, mem_ctx, pnew_utdv);
+               if (!NT_STATUS_IS_OK(status)) {
+                       ctx->error_message = talloc_asprintf(ctx,
+                               "Failed to call finishing operation: %s",
+                               nt_errstr(status));
+                       goto out;
+               }
        }
 
  out:


-- 
Samba Shared Repository