net_vampire: use generic output filename and use correct argv element.

Guenther
(This used to be commit e0843e631e379645296a5fe34dfc83bc265ebef3)

diff --git a/source3/libnet/libnet_samsync.h b/source3/libnet/libnet_samsync.h
index 125312888e9e4b452828148d89bd74845fd472ec..38ef9c56a5f63364e9f80751620a9678ac97a077 100644 (file)
--- a/source3/libnet/libnet_samsync.h
+++ b/source3/libnet/libnet_samsync.h
@@ -28,7 +28,7 @@ struct samsync_context {
        enum net_samsync_mode mode;
        const struct dom_sid *domain_sid;
        const char *domain_sid_str;
-       const char *ldif_filename;
+       const char *output_filename;
        void *private_data;
 };
 

diff --git a/source3/libnet/libnet_samsync_ldif.c b/source3/libnet/libnet_samsync_ldif.c
index 448c7c153e57e8188ede19a86a465fe83f7a8747..86de2ab253ff44808d1de4af4cd17a292190f1bf 100644 (file)
--- a/source3/libnet/libnet_samsync_ldif.c
+++ b/source3/libnet/libnet_samsync_ldif.c
@@ -1169,7 +1169,7 @@ NTSTATUS fetch_sam_entries_ldif(TALLOC_CTX *mem_ctx,
 
        status = ldif_init_context(mem_ctx,
                                   database_id,
-                                  ctx->ldif_filename,
+                                  ctx->output_filename,
                                   ctx->domain_sid_str,
                                   &ldif_ctx);
        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index a7c6c30e3472ac987861616e3b1ac6102b66f63a..90637e294d4f90fad073c0522ea60f6ee273dd12 100644 (file)
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -1244,7 +1244,7 @@ NTSTATUS rpc_vampire_ldif_internals(struct net_context *c,
        }
 
        if (argc >= 1) {
-               ctx->ldif_filename = argv[1];
+               ctx->output_filename = argv[0];
        }
 
        /* fetch domain */