diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-11 11:11:42 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-11 11:11:42 +1000 |
| commit | ae977ef24780c52da66e3608a3ed94649ae9f873 (patch) | |
| tree | 51f1a491b9f515049bc6eb3dc2b3b8ae2a3743e6 /source4/scripting | |
| parent | 9198a519bea19a4d9f863fde5fb3aa23f60b5c88 (diff) | |
| parent | 8ed6f6d5a825c8b0e8d66d30877a91a96fe6e7a4 (diff) | |
| download | samba-ae977ef24780c52da66e3608a3ed94649ae9f873.tar.gz samba-ae977ef24780c52da66e3608a3ed94649ae9f873.tar.bz2 samba-ae977ef24780c52da66e3608a3ed94649ae9f873.zip | |
Fix merge errors on C provision interface after jelmer's good work.
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 5bf1c89cf8af08fbcf4f5089079920840daad7b8)
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/ejs/config.mk | 1 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk index 33a4ac915f..ea64d24eea 100644 --- a/source4/scripting/ejs/config.mk +++ b/source4/scripting/ejs/config.mk @@ -90,7 +90,6 @@ PRIVATE_DEPENDENCIES = \ ####################### # Start BINARY SMBSCRIPT [BINARY::smbscript] -INSTALLDIR = BINDIR OBJ_FILES = \ smbscript.o PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-HOSTCONFIG diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index ff76681c13..16b1eb2156 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -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); |