The branch, master has been updated
via 5218bcf s4-provision: Reset "debuglevel" after "provision" take
place
via fb0add6 s4-libnet_vampire: Reparent result.lp_ctx - we have already
referenced it
via 9c27099 s4-test: Fix PYTHONPATH for python.drs_ tests
via dd380e3 s4-test: Use absolute path for 'samba4srcdir'
from 4aa8aaa s3-waf: convert NSS_INFO into a subsystem.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5218bcf76fb30560741cf5511ff38d7dd93e0f18
Author: Kamen Mazdrashki <[email protected]>
Date: Sun Oct 3 04:33:02 2010 +0300
s4-provision: Reset "debuglevel" after "provision" take place
Otherwise "provision" resets our current debug level and
we don't get debug messages we may expect onwards
Autobuild-User: Kamen Mazdrashki <[email protected]>
Autobuild-Date: Tue Oct 5 11:32:50 UTC 2010 on sn-devel-104
commit fb0add66055f68edc849e29b3609e268b9c7a766
Author: Kamen Mazdrashki <[email protected]>
Date: Sun Oct 3 04:30:14 2010 +0300
s4-libnet_vampire: Reparent result.lp_ctx - we have already referenced it
which leads to warning that we are trying to steal
a context with references
commit 9c27099715b248206c2d5ca9e7db22532ad9f994
Author: Kamen Mazdrashki <[email protected]>
Date: Tue Oct 5 02:47:08 2010 +0300
s4-test: Fix PYTHONPATH for python.drs_ tests
commit dd380e34598639cfdbe447462972fff03e44b805
Author: Kamen Mazdrashki <[email protected]>
Date: Tue Oct 5 02:45:38 2010 +0300
s4-test: Use absolute path for 'samba4srcdir'
-----------------------------------------------------------------------
Summary of changes:
source4/libnet/libnet_vampire.c | 2 +-
source4/scripting/python/samba/provision.py | 16 +++++++++-------
source4/selftest/tests.py | 6 +++---
3 files changed, 13 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index 1b6a8dd..adcb010 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -173,7 +173,7 @@ NTSTATUS libnet_vampire_cb_prepare_db(void *private_data,
}
s->ldb = talloc_steal(s, result.samdb);
- s->lp_ctx = talloc_steal(s, result.lp_ctx);
+ s->lp_ctx = talloc_reparent(talloc_parent(result.lp_ctx), s,
result.lp_ctx);
s->provision_schema = dsdb_get_schema(s->ldb, s);
s->server_dn_str = talloc_steal(s, p->dest_dsa->server_dn_str);
diff --git a/source4/scripting/python/samba/provision.py
b/source4/scripting/python/samba/provision.py
index 96e7aa5..99e2e13 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1727,13 +1727,15 @@ def provision_become_dc(setup_dir=None,
logger = logging.getLogger("provision")
samba.set_debug_level(debuglevel)
- return provision(setup_dir, logger, 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)
+ res = provision(setup_dir, logger, 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)
+ res.lp.set("debuglevel", str(debuglevel))
+ return res
def create_phpldapadmin_config(path, setup_path, ldapi_uri):
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 5a2880a..7f59365 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -126,7 +126,7 @@ def plansmbtorturetestsuite(name, env, options):
plantestsuite_loadlist(modname, env, cmdline)
-samba4srcdir = os.path.normpath(os.path.join(os.path.dirname(__file__), ".."))
+samba4srcdir =
os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
builddir = os.getenv("BUILDDIR", samba4srcdir)
samba4bindir = os.path.normpath(os.path.join(builddir, "bin"))
smb4torture = binpath("smbtorture")
@@ -495,8 +495,8 @@ plantestsuite("samba4.blackbox.group.py", "none",
["PYTHON=%s" % python, os.path
plantestsuite("samba4.blackbox.spn.py(dc:local)", "dc:local", ["PYTHON=%s" %
python, os.path.join(samba4srcdir, "setup/tests/blackbox_spn.sh"),
'$PREFIX/dc'])
# DRS python tests
-plantestsuite("samba4.drs_delete_object.python(vampire_dc)", "vampire_dc",
['PYTHONPATH="$PYTHONPATH:$samba4srcdir/torture/drs/python"', 'DC1=$DC_SERVER',
'DC2=$VAMPIRE_DC_SERVER', subunitrun, 'delete_object',
'-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
-plantestsuite("samba4.drs_fsmo.python(vampire_dc)", "vampire_dc",
['PYTHONPATH="$PYTHONPATH:$samba4srcdir/torture/drs/python"', 'DC1=$DC_SERVER',
'DC2=$VAMPIRE_DC_SERVER', subunitrun, 'fsmo',
'-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
+plantestsuite("samba4.drs_delete_object.python(vampire_dc)", "vampire_dc",
['PYTHONPATH="$PYTHONPATH:%s"' % os.path.join(samba4srcdir,
'torture/drs/python'), 'DC1=$DC_SERVER', 'DC2=$VAMPIRE_DC_SERVER', subunitrun,
'delete_object', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
+plantestsuite("samba4.drs_fsmo.python(vampire_dc)", "vampire_dc",
['PYTHONPATH="$PYTHONPATH:%s"' % os.path.join(samba4srcdir,
'torture/drs/python'), 'DC1=$DC_SERVER', 'DC2=$VAMPIRE_DC_SERVER', subunitrun,
'fsmo', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
# This makes sure we test the rid allocation code
t = "RPC-SAMR-LARGE-DC"
--
Samba Shared Repository
