diff options
| author | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
| commit | 378e4d5b8d30733f0f28cc2bceb28d9b9b594707 (patch) | |
| tree | 9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/torture/locktest2.c | |
| parent | 2f249538ac8f2a54d9c8f8dbf0107db2f33bfe16 (diff) | |
| parent | 6b266b85cf34145ac1f03d8f787b81121e4ec92b (diff) | |
| download | samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.gz samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.bz2 samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/torture/locktest2.c')
| -rw-r--r-- | source4/torture/locktest2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/locktest2.c b/source4/torture/locktest2.c index 2cf28c3554..7364d6df2f 100644 --- a/source4/torture/locktest2.c +++ b/source4/torture/locktest2.c @@ -173,7 +173,7 @@ static struct smbcli_state *connect_one(TALLOC_CTX *mem_ctx, nt_status = smbcli_full_connection(NULL, &c, myname, server_n, ports, share, NULL, - username, lp_workgroup(), password, ev, + username, lpcfg_workgroup(), password, ev, options, session_options, gensec_settings); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("smbcli_full_connection failed with error %s\n", nt_errstr(nt_status))); @@ -513,7 +513,7 @@ static void usage(void) argv += 4; lp_ctx = loadparm_init(mem_ctx); - lp_load(lp_ctx, dyn_CONFIGFILE); + lpcfg_load(lp_ctx, dyn_CONFIGFILE); if (getenv("USER")) { username = talloc_strdup(mem_ctx, getenv("USER")); @@ -568,11 +568,11 @@ static void usage(void) ev = s4_event_context_init(mem_ctx); locking_init(1); - lp_smbcli_options(lp_ctx, &options); - lp_smbcli_session_options(lp_ctx, &session_options); + lpcfg_smbcli_options(lp_ctx, &options); + lpcfg_smbcli_session_options(lp_ctx, &session_options); test_locks(mem_ctx, share1, share2, nfspath1, nfspath2, - lp_smb_ports(lp_ctx), - &options, &session_options, lp_gensec_settings(lp_ctx), ev); + lpcfg_smb_ports(lp_ctx), + &options, &session_options, lpcfg_gensec_settings(lp_ctx), ev); return(0); } |