[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  618c714 lib:replace: Fix linking when libtirpc-devel overwrites system headers
      from  9bbabf6 pdb_samba_dsdb: make use of dom_sid_is_valid_account_domain()

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


- Log -----------------------------------------------------------------
commit 618c714b6b6c0b63993299b40b9a466adb753cc2
Author: Noel Power <noel.power at suse.com>
Date:   Thu Mar 15 16:46:39 2018 +0000

    lib:replace: Fix linking when libtirpc-devel overwrites system headers
    
    Some systems (like SUSE currently) install the new tirpc headers by
    overwritting the existing system location used by gcc. This patch will
    detect if the headers in the system location belong to tirpc or not.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13341
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Tue Mar 20 16:07:05 CET 2018 on sn-devel-144

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

Summary of changes:
 lib/replace/wscript | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 534062e..6639897 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -68,7 +68,15 @@ def configure(conf):
     conf.CHECK_HEADERS('aio.h sys/unistd.h alloca.h float.h')
 
     conf.SET_TARGET_TYPE('tirpc', 'EMPTY')
-    conf.CHECK_HEADERS('rpc/rpc.h rpc/nettype.h')
+
+    if conf.CHECK_CODE(
+            '\n#ifndef _TIRPC_RPC_H\n#error "no tirpc headers in system path"\n#endif\n',
+            'HAVE_RPC_RPC_HEADERS',
+            headers=['rpc/rpc.h', 'rpc/nettype.h'],
+            msg='Checking for tirpc rpc headers in default system path'):
+        if conf.CONFIG_SET('HAVE_RPC_RPC_H'):
+            conf.undefine('HAVE_RPC_RPC_H')
+
     if not conf.CONFIG_SET('HAVE_RPC_RPC_H'):
         if conf.CHECK_CFG(package='libtirpc', args='--cflags --libs',
                        msg='Checking for libtirpc headers',


-- 
Samba Shared Repository