[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  3a0fd53f7c3 lib/replace: Remove #undef TCP_NODELAY
       via  7c9eb428d59 autobuild: Fix autobuild for python3
      from  fef8ec20d0f lib ldb ldb_key_value: csbuild unused parm ldb_kv

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


- Log -----------------------------------------------------------------
commit 3a0fd53f7c3cfa9ce26f9f4b1da4a1ac1dc4e44a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jun 11 14:44:14 2019 +0200

    lib/replace: Remove #undef TCP_NODELAY
    
    A duplicate define warning is better than not defining this at all.
    
    Similar to a patch Torsten Werner submitted to the Samba Bugzilla in
    2005.
    
    Not tested on HP-UX
    
    reverts fc84e916f628b4fb6f6667ad45d0ced0e9134b23 that was still present in
    the new copy of nis.h created in c29d087e1ea4c92717ef86e372fe80f410580fdc
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=2406
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=2140
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Tue Jun 18 06:47:05 UTC 2019 on sn-devel-184

commit 7c9eb428d59145cadd6baa54c3f31e69e149f7ff
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jun 14 14:55:03 2019 +0200

    autobuild: Fix autobuild for python3
    
    "keys()" in python3 returns an unmodifiable view object. Two lines
    down we might want to modify it, which python3 does not allow.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Noel Power <npower at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 lib/replace/system/nis.h | 28 ----------------------------
 script/autobuild.py      |  2 +-
 2 files changed, 1 insertion(+), 29 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/system/nis.h b/lib/replace/system/nis.h
index 068595a1628..7213b1550b3 100644
--- a/lib/replace/system/nis.h
+++ b/lib/replace/system/nis.h
@@ -33,20 +33,6 @@
 #if defined(HAVE_SYS_SECURITY_H) && defined(HAVE_RPC_AUTH_ERROR_CONFLICT)
 #undef AUTH_ERROR
 #endif /* HAVE_SYS_SECURITY_H && HAVE_RPC_AUTH_ERROR_CONFLICT */
-/*
- * HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in <netinet/tcp.h> which
- * was included above.  However <rpc/rpc.h> includes <sys/xti.h> which defines
- * them again without checking if they already exsist.  This generates
- * two "Redefinition of macro" warnings for every single .c file that is
- * compiled.
- */
-#if defined(HPUX) && defined(TCP_NODELAY)
-#undef TCP_NODELAY
-#endif /* HPUX && TCP_NODELAY */
-
-#if defined(HPUX) && defined(TCP_MAXSEG)
-#undef TCP_MAXSEG
-#endif /* HPUX && TCP_MAXSEG */
 
 #include <rpc/rpc.h>
 #endif /* HAVE_RPC_RPC_H */
@@ -55,20 +41,6 @@
 #if defined (HAVE_NETGROUP)
 
 #if defined(HAVE_RPCSVC_YP_PROT_H)
-/*
- * HP-UX 11.X has TCP_NODELAY and TCP_MAXSEG defined in <netinet/tcp.h> which
- * was included above.  However <rpc/rpc.h> includes <sys/xti.h> which defines
- * them again without checking if they already exsist.  This generates
- * two "Redefinition of macro" warnings for every single .c file that is
- * compiled.
- */
-#if defined(HPUX) && defined(TCP_NODELAY)
-#undef TCP_NODELAY
-#endif /* HPUX && TCP_MAXSEG */
-
-#if defined(HPUX) && defined(TCP_MAXSEG)
-#undef TCP_MAXSEG
-#endif /* HPUX && TCP_MAXSEG */
 
 #include <rpcsvc/yp_prot.h>
 
diff --git a/script/autobuild.py b/script/autobuild.py
index 13dd57987c4..b62bea25d4d 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -141,7 +141,7 @@ builddirs = {
     "pidl": "pidl"
 }
 
-defaulttasks = builddirs.keys()
+defaulttasks = list(builddirs.keys())
 
 if os.environ.get("AUTOBUILD_SKIP_SAMBA_O3", "0") == "1":
     defaulttasks.remove("samba-o3")


-- 
Samba Shared Repository