diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-02 15:43:40 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-06 15:02:38 +1000 |
| commit | c091a92be51e8c14bf0b51ab83319fbcb704c91f (patch) | |
| tree | 24e7f44491a9cf328e1622f46c2558d6476dedeb /source4/torture | |
| parent | 6bf88222cc00ac765929ed6e844552a9a776109a (diff) | |
| download | samba-c091a92be51e8c14bf0b51ab83319fbcb704c91f.tar.gz samba-c091a92be51e8c14bf0b51ab83319fbcb704c91f.tar.bz2 samba-c091a92be51e8c14bf0b51ab83319fbcb704c91f.zip | |
s4-param Remove 'sam database' parameter
This now just relies on the private dir parameter, which remains.
Andrew Bartlett
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/libnet/libnet_BecomeDC.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c index b532e071c7..9f569e6a48 100644 --- a/source4/torture/libnet/libnet_BecomeDC.c +++ b/source4/torture/libnet/libnet_BecomeDC.c @@ -44,7 +44,7 @@ bool torture_net_become_dc(struct torture_context *torture) struct ldb_message *msg; int ldb_ret; uint32_t i; - char *sam_ldb_path; + char *private_dir; const char *address; struct nbt_name name; const char *netbios_name; @@ -144,13 +144,13 @@ bool torture_net_become_dc(struct torture_context *torture) talloc_unlink(s, ldb); lp_ctx = libnet_vampire_cb_lp_ctx(s); - sam_ldb_path = talloc_asprintf(s, "%s/%s", location, "private/sam.ldb"); - lpcfg_set_cmdline(lp_ctx, "sam database", sam_ldb_path); - torture_comment(torture, "Reopen the SAM LDB with system credentials and all replicated data: %s\n", sam_ldb_path); + private_dir = talloc_asprintf(s, "%s/%s", location, "private"); + lpcfg_set_cmdline(lp_ctx, "private dir", private_dir); + torture_comment(torture, "Reopen the SAM LDB with system credentials and all replicated data: %s\n", private_dir); ldb = samdb_connect(s, torture->ev, lp_ctx, system_session(lp_ctx), 0); torture_assert_goto(torture, ldb != NULL, ret, cleanup, talloc_asprintf(torture, - "Failed to open '%s'\n", sam_ldb_path)); + "Failed to open '%s/sam.ldb'\n", private_dir)); torture_assert_goto(torture, dsdb_uses_global_schema(ldb), ret, cleanup, "Uses global schema"); |