[SCM] Samba Shared Repository - branch master updated

Andrew Tridgell tridge at samba.org
Fri Dec 10 01:31:02 MST 2010


The branch, master has been updated
       via  1b63c78 waf: the libXX.inst.so file also depends on the vscript
       via  283686a s3-vfstest: fixed paths in vfstest
      from  e928032 wintest flush DNS on Windows clients to improve reliablity

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1b63c78693ab5d244006769c1b41ff37d990d1b2
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Dec 10 17:59:34 2010 +1100

    waf: the libXX.inst.so file also depends on the vscript
    
    this fixes a problem with installed libraries not relinking after a
    git version change
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Fri Dec 10 09:30:46 CET 2010 on sn-devel-104

commit 283686af75c4ca3b8317f04754dab64bbf9f64e8
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Dec 9 22:41:58 2010 +1100

    s3-vfstest: fixed paths in vfstest
    
    vfstest tries to create /messages.tdb as loadparm has not been
    initialised

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/wafsamba.py |    4 ++++
 source3/torture/vfstest.c       |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index fb68531..3cb97c0 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -215,6 +215,10 @@ def SAMBA_LIBRARY(bld, libname, source,
             ldflags.append("-Wl,--version-script=%s/%s" % (bld.path.abspath(bld.env), vscript))
             fullname = bld.env.shlib_PATTERN % bundled_name
             bld.add_manual_dependency(bld.path.find_or_declare(fullname), bld.path.find_or_declare(vscript))
+            if Options.is_install:
+                # also make the .inst file depend on the vscript
+                instname = bld.env.shlib_PATTERN % (bundled_name + '.inst')
+                bld.add_manual_dependency(bld.path.find_or_declare(instname), bld.path.find_or_declare(vscript))
 
     bld.SET_BUILD_GROUP(group)
     t = bld(
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index 3ebe63e..479bc86 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -457,6 +457,8 @@ int main(int argc, char *argv[])
 
 	poptFreeContext(pc);
 
+	lp_load_initial_only(get_dyn_CONFIGFILE());
+
 	/* TODO: check output */
 	reload_services(smbd_messaging_context(), -1, False);
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list