diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 23:33:22 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:55 +0100 |
| commit | 509e82e402d64c79f27c9a10d75b100a1ac5fefa (patch) | |
| tree | a7770d609512848c17f413764e9dc0bd43acce5d /source4/torture/locktest.c | |
| parent | da0f222f432c4fc8bf5da80baf849ca32b315ca0 (diff) | |
| download | samba-509e82e402d64c79f27c9a10d75b100a1ac5fefa.tar.gz | |
r26272: Remove global_loadparm in some more places.
(This used to be commit 1ab76ecc5311fa863e5d04899b6f110899818f55)
Diffstat (limited to 'source4/torture/locktest.c')
| -rw-r--r-- | source4/torture/locktest.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index 7d111be12b2..381abaebc61 100644 --- a/source4/torture/locktest.c +++ b/source4/torture/locktest.c @@ -105,7 +105,8 @@ static struct record *recorded; /***************************************************** return a connection to a server *******************************************************/ -static struct smbcli_state *connect_one(char *share, int snum, int conn) +static struct smbcli_state *connect_one(struct loadparm_context *lp_ctx, + char *share, int snum, int conn) { struct smbcli_state *c; fstring server, myname; @@ -124,7 +125,7 @@ static struct smbcli_state *connect_one(char *share, int snum, int conn) char **unc_list = NULL; int num_unc_names; const char *p; - p = lp_parm_string(global_loadparm, NULL, "torture", "unclist"); + p = lp_parm_string(lp_ctx, NULL, "torture", "unclist"); if (p) { char *h, *s; unc_list = file_lines_load(p, &num_unc_names, NULL); @@ -183,7 +184,8 @@ static void reconnect(struct smbcli_state *cli[NSERVERS][NCONNECTIONS], int fnum } talloc_free(cli[server][conn]); } - cli[server][conn] = connect_one(share[server], server, conn); + cli[server][conn] = connect_one(global_loadparm, share[server], + server, conn); if (!cli[server][conn]) { DEBUG(0,("Failed to connect to %s\n", share[server])); exit(1); |