sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-28 11:42:03 +03:00
Code Activity

Fix merge errors on C provision interface after jelmer's good work.

Browse Source 
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

Conflicts:

	source/torture/local/torture.c
(This used to be commit 5bf1c89cf8)
This commit is contained in:
Andrew Bartlett
2008-04-11 11:11:42 +10:00
parent 9198a519be 8ed6f6d5a8
commit ae977ef247
11 changed files with 121 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source4/scripting/python/samba/provision.py
View File

@ -1088,7 +1088,7 @@ def provision_become_dc(setup_dir=None,
"""print a message if quiet is not set."""
print text
provision(setup_dir, message, system_session(), None,
return provision(setup_dir, message, system_session(), None,
smbconf=smbconf, targetdir=targetdir, samdb_fill=FILL_DRS, realm=realm,
rootdn=rootdn, domaindn=domaindn, schemadn=schemadn, configdn=configdn, serverdn=serverdn,
domain=domain, hostname=hostname, hostip="127.0.0.1", domainsid=domainsid, machinepass=machinepass, serverrole="domain controller", sitename=sitename);