[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-695-g073ed0d
Jelmer Vernooij
jelmer at samba.org
Sat Feb 9 16:43:00 GMT 2008
The branch, v4-0-test has been updated
via 073ed0dd1cc8fae9eb4a2f7ff6763124917c56e8 (commit)
via 13a7dfb90066a52e0d90dbed5fe2c82c4af6092c (commit)
via 68f13d87eb034fdbc712169f2d1b1a0475751ec5 (commit)
via dad809030478a85ac13a73bce9c07314792f01c2 (commit)
via 3f24136b56d281580410bf69841c6dece5508d17 (commit)
via c0fef09c5d88158b620f38b6f74498a8b6323bd9 (commit)
from 3c64fc7dc631a79154957e45f8961e2ee519743f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 073ed0dd1cc8fae9eb4a2f7ff6763124917c56e8
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 9 17:42:31 2008 +0100
Add docstring.
commit 13a7dfb90066a52e0d90dbed5fe2c82c4af6092c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 9 17:41:50 2008 +0100
Ignore Python apidocs, vim swap files.
commit 68f13d87eb034fdbc712169f2d1b1a0475751ec5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 9 17:37:42 2008 +0100
Fix syntax of docstrings, set project name when generating Python API documentation.
commit dad809030478a85ac13a73bce9c07314792f01c2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 9 17:18:51 2008 +0100
registry: Fix warning.
commit 3f24136b56d281580410bf69841c6dece5508d17
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 9 17:17:21 2008 +0100
Move nmblookup blackbox test closer to the code it tests.
commit c0fef09c5d88158b620f38b6f74498a8b6323bd9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 9 17:07:02 2008 +0100
Move first_prereq test to m4 code.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 ++
source/build/m4/check_make.m4 | 8 ++++++++
source/build/smb_build/makefile.pm | 8 +-------
source/lib/registry/ldb.c | 2 +-
source/scripting/python/config.mk | 2 +-
source/scripting/python/samba/provision.py | 6 ++----
source/scripting/python/samba/tests/provision.py | 2 ++
source/scripting/python/samba/upgrade.py | 2 +-
source/selftest/samba4_tests.sh | 4 ++--
.../utils/tests}/test_nmblookup.sh | 0
10 files changed, 20 insertions(+), 16 deletions(-)
rename {testprogs/blackbox => source/utils/tests}/test_nmblookup.sh (100%)
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index 9ed0334..a85553d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -193,3 +193,5 @@ source/lib/util/apidocs
source/lib/util/util_ldb.h
source/libcli/ldap/ldap_ndr.h
source/libcli/resolve/lp_proto.h
+source/apidocs
+*.swp
diff --git a/source/build/m4/check_make.m4 b/source/build/m4/check_make.m4
index 4780f43..d779964 100644
--- a/source/build/m4/check_make.m4
+++ b/source/build/m4/check_make.m4
@@ -46,3 +46,11 @@ AC_ARG_ENABLE(automatic-dependencies,
[ automatic_dependencies=no ])
AC_MSG_RESULT($automatic_dependencies)
AC_SUBST(automatic_dependencies)
+
+FIRST_PREREQ="\$*.c"
+AC_SUBST(FIRST_PREREQ)
+
+if test x$GNU_MAKE = xyes; then
+ FIRST_PREREQ="\$<"
+fi
+
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 0b1cc7e..5799d89 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -111,14 +111,9 @@ __EOD__
sub _prepare_suffix_rules($)
{
my ($self) = @_;
- my $first_prereq = '$*.c';
-
- if ($self->{config}->{GNU_MAKE} eq 'yes') {
- $first_prereq = '$<';
- }
$self->output(<< "__EOD__"
-FIRST_PREREQ = $first_prereq
+FIRST_PREREQ = $self->{config}->{FIRST_PREREQ}
__EOD__
);
@@ -461,7 +456,6 @@ sub Binary($$)
push (@{$self->{torture_progs}}, "$installdir/$ctx->{BINARY}");
}
-
push (@{$self->{binaries}}, "$localdir/$ctx->{BINARY}");
$self->_prepare_list($ctx, "OBJ_LIST");
diff --git a/source/lib/registry/ldb.c b/source/lib/registry/ldb.c
index 262859f..0c8a553 100644
--- a/source/lib/registry/ldb.c
+++ b/source/lib/registry/ldb.c
@@ -400,7 +400,7 @@ static WERROR ldb_add_key(TALLOC_CTX *mem_ctx, const struct hive_key *parent,
struct security_descriptor *sd,
struct hive_key **newkey)
{
- struct ldb_key_data *parentkd = (const struct ldb_key_data *)parent;
+ struct ldb_key_data *parentkd = discard_const_p(struct ldb_key_data, parent);
struct ldb_message *msg;
struct ldb_key_data *newkd;
int ret;
diff --git a/source/scripting/python/config.mk b/source/scripting/python/config.mk
index 450da0e..b15e1fc 100644
--- a/source/scripting/python/config.mk
+++ b/source/scripting/python/config.mk
@@ -33,7 +33,7 @@ pythonmods:: $(PYTHON_DSOS) $(PYTHON_PYS)
PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
pydoctor:: pythonmods
- LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
+ LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --project-name=Samba --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
installpython:: pythonmods
@$(SHELL) $(srcdir)/script/installpython.sh \
diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py
index 7dd564f..4f52d36 100644
--- a/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@ -278,13 +278,12 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
Alternatively, provision() may call this, and then populate the database.
:param erase: Remove the existing data present in the database.
- :param
:note: This will wipe the Sam Database!
:note: This function always removes the local SAM LDB file. The erase
- parameter controls whether to erase the existing data, which
- may not be stored locally but in LDAP.
+ parameter controls whether to erase the existing data, which
+ may not be stored locally but in LDAP.
"""
assert session_info is not None
@@ -479,7 +478,6 @@ def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname,
:param samdb: Sam Database handle
:param setup_path: Obtain setup path
- ...
"""
setup_add_ldif(samdb, setup_path("provision_rootdse_add.ldif"), {
"SCHEMADN": schemadn,
diff --git a/source/scripting/python/samba/tests/provision.py b/source/scripting/python/samba/tests/provision.py
index eb49f7a..54a7782 100644
--- a/source/scripting/python/samba/tests/provision.py
+++ b/source/scripting/python/samba/tests/provision.py
@@ -33,6 +33,8 @@ def setup_path(file):
class ProvisionTestCase(samba.tests.TestCaseInTempDir):
+ """Some simple tests for individual functions in the provisioning code.
+ """
def test_setup_secretsdb(self):
path = os.path.join(self.tempdir, "secrets.ldb")
ldb = setup_secretsdb(path, setup_path, None, None, lp=lp)
diff --git a/source/scripting/python/samba/upgrade.py b/source/scripting/python/samba/upgrade.py
index b332bb8..8bf75d7 100644
--- a/source/scripting/python/samba/upgrade.py
+++ b/source/scripting/python/samba/upgrade.py
@@ -10,6 +10,7 @@
from provision import findnss, provision, FILL_DRS
import grp
import ldb
+import time
import pwd
import uuid
import registry
@@ -162,7 +163,6 @@ def import_wins(samba4_winsdb, samba3_winsdb):
:param samba3_winsdb: WINS database to import from
"""
version_id = 0
- import time
for (name, (ttl, ips, nb_flags)) in samba3_winsdb.items():
version_id+=1
diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index d00b492..c2ce9dc 100755
--- a/source/selftest/samba4_tests.sh
+++ b/source/selftest/samba4_tests.sh
@@ -251,8 +251,8 @@ bbdir=$incdir/../../testprogs/blackbox
plantest "blackbox.smbclient" dc $bbdir/test_smbclient.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX"
plantest "blackbox.cifsdd" dc $bbdir/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
-plantest "blackbox.nmblookup" dc $bbdir/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
-plantest "blackbox.nmblookup" member $bbdir/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
+plantest "blackbox.nmblookup" dc $samba4srcdir/utils/tests/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
+plantest "blackbox.nmblookup" member $samba4srcdir/utils/tests/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
# Tests using the "Simple" NTVFS backend
diff --git a/testprogs/blackbox/test_nmblookup.sh b/source/utils/tests/test_nmblookup.sh
similarity index 100%
rename from testprogs/blackbox/test_nmblookup.sh
rename to source/utils/tests/test_nmblookup.sh
--
Samba Shared Repository
More information about the samba-cvs
mailing list