sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s4-provision: pass use_ntvfs from C wrappers and set to true in tests/vampire

Browse Source 
None of these cases need the complexity of the s3fs backend.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-08-21 19:58:18 +10:00
parent c4b9c3aba8
commit b5c2747cad
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/libnet/libnet_vampire.c
View File

@ -162,7 +162,7 @@ NTSTATUS libnet_vampire_cb_prepare_db(void *private_data,
settings.server_dn_str = p->dest_dsa->server_dn_str;
settings.machine_password = generate_random_password(s, 16, 255);
settings.targetdir = s->targetdir;
settings.use_ntvfs = true;
status = provision_bare(s, s->lp_ctx, &settings, &result);
if (!NT_STATUS_IS_OK(status)) {

2
source4/param/provision.c
View File

@ -167,6 +167,8 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
PyDict_SetItemString(parameters, "debuglevel", PyInt_FromLong(DEBUGLEVEL));
PyDict_SetItemString(parameters, "use_ntvfs", PyInt_FromLong(settings->use_ntvfs));
py_result = PyEval_CallObjectWithKeywords(provision_fn, NULL, parameters);
Py_DECREF(parameters);

1
source4/param/provision.h
View File

@ -35,6 +35,7 @@ struct provision_settings {
const char *ntds_dn_str;
const char *machine_password;
const char *targetdir;
bool use_ntvfs;
};
/* FIXME: Rename this to hostconfig ? */

4
source4/scripting/python/samba/provision/__init__.py
View File

@ -1938,7 +1938,7 @@ def provision_become_dc(smbconf=None, targetdir=None,
policyguid_dc=None, invocationid=None, machinepass=None, dnspass=None,
dns_backend=None, root=None, nobody=None, users=None, wheel=None,
backup=None, serverrole=None, ldap_backend=None,
ldap_backend_type=None, sitename=None, debuglevel=1):
ldap_backend_type=None, sitename=None, debuglevel=1, use_ntvfs=False):
logger = logging.getLogger("provision")
samba.set_debug_level(debuglevel)
@ -1949,7 +1949,7 @@ def provision_become_dc(smbconf=None, targetdir=None,
configdn=configdn, serverdn=serverdn, domain=domain,
hostname=hostname, hostip=None, domainsid=domainsid,
machinepass=machinepass, serverrole="active directory domain controller",
sitename=sitename, dns_backend=dns_backend, dnspass=dnspass)
sitename=sitename, dns_backend=dns_backend, dnspass=dnspass, use_ntvfs=use_ntvfs)
res.lp.set("debuglevel", str(debuglevel))
return res

1
source4/torture/local/torture.c
View File

@ -61,6 +61,7 @@ static bool test_provision(struct torture_context *tctx)
settings->netbios_name = "torture";
settings->ntds_dn_str = NULL;
settings->machine_password = "geheim";
settings->use_ntvfs = true;
status = provision_bare(settings, tctx->lp_ctx, settings, &result);