sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-09 01:44:21 +03:00
Code Activity

Remove use of global_loadparm.

Browse Source
This commit is contained in:
Jelmer Vernooij
2008-02-28 20:30:03 +01:00
parent 16f36ce499
commit 4472d7e1e4
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/libcli/smb_composite/fetchfile.c
View File

@@ -150,7 +150,7 @@ struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetc
state->connect->in.options = io->in.options; state->connect->in.options = io->in.options;
state->creq = smb_composite_connect_send(state->connect, state, state->creq = smb_composite_connect_send(state->connect, state,
lp_resolve_context(global_loadparm), event_ctx); io->in.resolve_ctx, event_ctx);
if (state->creq == NULL) goto failed; if (state->creq == NULL) goto failed;
state->creq->async.private_data = c; state->creq->async.private_data = c;

1
source/libcli/smb_composite/smb_composite.h
View File

@@ -56,6 +56,7 @@ struct smb_composite_fetchfile {
const char *workgroup; const char *workgroup;
const char *filename; const char *filename;
struct smbcli_options options; struct smbcli_options options;
struct resolve_context *resolve_ctx;
} in; } in;
struct { struct {
uint8_t *data; uint8_t *data;

2
source/torture/raw/composite.c
View File

@@ -31,6 +31,7 @@
#include "lib/cmdline/popt_common.h" #include "lib/cmdline/popt_common.h"
#include "torture/util.h" #include "torture/util.h"
#include "param/param.h" #include "param/param.h"
#include "libcli/resolve/resolve.h"
#define BASEDIR "\\composite" #define BASEDIR "\\composite"
@@ -161,6 +162,7 @@ static bool test_fetchfile(struct smbcli_state *cli, struct torture_context *tct
io2.in.credentials = cmdline_credentials; io2.in.credentials = cmdline_credentials;
io2.in.workgroup = lp_workgroup(tctx->lp_ctx); io2.in.workgroup = lp_workgroup(tctx->lp_ctx);
io2.in.filename = fname; io2.in.filename = fname;
io2.in.resolve_ctx = lp_resolve_context(tctx->lp_ctx);
lp_smbcli_options(tctx->lp_ctx, &io2.in.options); lp_smbcli_options(tctx->lp_ctx, &io2.in.options);
printf("testing parallel fetchfile with %d ops\n", torture_numops); printf("testing parallel fetchfile with %d ops\n", torture_numops);