[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  0628ca2a558 tdb: Fix compatibility of wscript with older python
       via  08ba013a2b8 s4/messaging: Fix undefined reference in linking libMESSAGING-samba4.so
      from  60aa7b3634e group_audit: error handling in group change

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


- Log -----------------------------------------------------------------
commit 0628ca2a558871402f9a17cc7f7a0c69d857ae19
Author: Lukas Slebodnik <lslebodn at fedoraproject.org>
Date:   Fri Jan 18 16:38:03 2019 +0100

    tdb: Fix compatibility of wscript with older python
    
    Traceback (most recent call last):
      File "tdb-1.3.17/third_party/waf/waflib/Scripting.py", line 158, in waf_entry_point
        run_commands()
      File "tdb-1.3.17/third_party/waf/waflib/Scripting.py", line 251, in run_commands
        ctx = run_command(cmd_name)
      File "tdb-1.3.17/third_party/waf/waflib/Scripting.py", line 235, in run_command
        ctx.execute()
      File "tdb-1.3.17/third_party/waf/waflib/Context.py", line 204, in execute
        self.recurse([os.path.dirname(g_module.root_path)])
      File "tdb-1.3.17/third_party/waf/waflib/Context.py", line 286, in recurse
        user_function(self)
      File "tdb-1.3.17/wscript", line 225, in testonly
        cmd = "BINDIR={} {}".format(blddir, sh_test)
    ValueError: zero length field name in format
    
    Signed-off-by: Lukas Slebodnik <lslebodn at fedoraproject.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Sun Jan 20 03:49:59 CET 2019 on sn-devel-144

commit 08ba013a2b8b2cf9fc17fdcb3d107e1434709036
Author: Anoop C S <anoopcs at redhat.com>
Date:   Thu Dec 27 18:19:42 2018 +0530

    s4/messaging: Fix undefined reference in linking libMESSAGING-samba4.so
    
    Early check for DEVELOPER or ENABLE_SELFTEST configure options inside
    messaging_handlers.c leaves us with the following undefined reference
    linkage error:
    
    [1315/3712] Linking bin/default/source4/lib/messaging/libMESSAGING-samba4.so
    /usr/bin/ld: source4/lib/messaging/messaging.c.4.o: in function
    						`imessaging_init_internal':
    /root/samba.git/bin/default/../../source4/lib/messaging/messaging.c:472:
    		undefined reference to `imessaging_register_extra_handlers'
    collect2: error: ld returned 1 exit status
    
    This happened due to failure in including "includes.h" before checking
    the above mentioned configure options.
    
    Signed-off-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 lib/tdb/wscript                            | 2 +-
 source4/lib/messaging/messaging_handlers.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 6a6adabc4c1..2c31f696808 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -222,7 +222,7 @@ def testonly(ctx):
         sh_tests = ["test/test_tdbbackup.sh test/jenkins-be-hash.tdb"]
 
         for sh_test in sh_tests:
-            cmd = "BINDIR={} {}".format(blddir, sh_test)
+            cmd = "BINDIR=%s %s" % (blddir, sh_test)
             print("shell test: " + cmd)
             ret = samba_utils.RUN_COMMAND(cmd)
             if ret != 0:
diff --git a/source4/lib/messaging/messaging_handlers.c b/source4/lib/messaging/messaging_handlers.c
index aee7b66e306..342157d5b4a 100644
--- a/source4/lib/messaging/messaging_handlers.c
+++ b/source4/lib/messaging/messaging_handlers.c
@@ -22,13 +22,13 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(DEVELOPER) || defined(ENABLE_SELFTEST)
-
 #include "includes.h"
 #include "lib/util/server_id.h"
 #include "messaging/messaging.h"
 #include "messaging/messaging_internal.h"
 
+#if defined(DEVELOPER) || defined(ENABLE_SELFTEST)
+
 /*
  * Inject a fault into the currently running process
  */


-- 
Samba Shared Repository