summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-06-16 13:49:05 +0200
committerGünther Deschner <gd@samba.org>2008-06-17 10:49:13 +0200
commit16eb846fa5c9ef0b15eade917e0fe6a9bb3d8624 (patch)
tree3646b9df89540296ab1d133dc411908e738d39de
parent51fec7863b589dacfccaa0263c877d52a6d60a12 (diff)
downloadsamba-16eb846fa5c9ef0b15eade917e0fe6a9bb3d8624.tar.gz
samba-16eb846fa5c9ef0b15eade917e0fe6a9bb3d8624.tar.bz2
samba-16eb846fa5c9ef0b15eade917e0fe6a9bb3d8624.zip
net_vampire: use generic output filename and use correct argv element.
Guenther (This used to be commit e0843e631e379645296a5fe34dfc83bc265ebef3)
-rw-r--r--source3/libnet/libnet_samsync.h2
-rw-r--r--source3/libnet/libnet_samsync_ldif.c2
-rw-r--r--source3/utils/net_rpc_samsync.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/libnet/libnet_samsync.h b/source3/libnet/libnet_samsync.h
index 125312888e..38ef9c56a5 100644
--- 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 448c7c153e..86de2ab253 100644
--- 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 a7c6c30e34..90637e294d 100644
--- 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 */