autobuild[sn-devel-144]: intermittent test failure detected

2018-08-09 Thread autobuild 
The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   
https://git.samba.org/autobuild.flakey.sn-devel-144/2018-08-10-0637/flakey.log

The failure seems to be in the "samba-nt4" suite, whose build logs are 
available here:

   
https://git.samba.org/autobuild.flakey.sn-devel-144/2018-08-10-0637/samba-nt4.stderr
   
https://git.samba.org/autobuild.flakey.sn-devel-144/2018-08-10-0637/samba-nt4.stdout
  
The top commit at the time of the failure was:

commit 1a86733d034019083cadb137cb81dba661f96b66
Author: Amitay Isaacs 
Date:   Wed Aug 8 19:44:38 2018 +1000

provision: Add support for BIND 9.12.x

Signed-off-by: Amitay Isaacs 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Fri Aug 10 05:36:19 CEST 2018 on sn-devel-144

and the last 50 lines of the stdout log were:

[516(2402)/563 at 18m48s] 
samba.wbinfo_simple.online-status.domain=$DOMAIN(nt4_dc:local)
[517(2403)/563 at 18m48s] 
samba.wbinfo_simple.check-secret.domain=$DOMAIN(nt4_dc:local)
[518(2404)/563 at 18m48s] 
samba.wbinfo_simple.change-secret.domain=$DOMAIN(nt4_dc:local)
[519(2405)/563 at 18m48s] 
samba.wbinfo_simple.check-secret.domain=$DOMAIN(nt4_dc:local)
[520(2406)/563 at 18m48s] 
samba.wbinfo_simple.online-status.domain=$DOMAIN(nt4_dc:local)
[521(2407)/563 at 18m48s] samba.wbinfo_simple.domain-users(nt4_dc:local)
[522(2408)/563 at 18m48s] samba.wbinfo_simple.domain-groups(nt4_dc:local)
[523(2409)/563 at 18m48s] 
samba.wbinfo_simple.name-to-sid=$DC_USERNAME(nt4_dc:local)
[524(2410)/563 at 18m48s] 
samba.wbinfo_simple.name-to-sid=$DOMAIN/$DC_USERNAME(nt4_dc:local)
[525(2411)/563 at 18m48s] 
samba.wbinfo_simple.user-info=$DOMAIN/$DC_USERNAME(nt4_dc:local)
[526(2412)/563 at 18m48s] 
samba.wbinfo_simple.user-groups=$DOMAIN/$DC_USERNAME(nt4_dc:local)
[527(2413)/563 at 18m49s] 
samba.wbinfo_simple.authenticate=$DOMAIN/$DC_USERNAME%$DC_PASSWORD(nt4_dc:local)
[528(2414)/563 at 18m49s] samba.wbinfo_simple.allocate-uid(nt4_dc:local)
[529(2415)/563 at 18m49s] samba.wbinfo_simple.allocate-gid(nt4_dc:local)
[530(2416)/563 at 18m49s] samba.wbinfo_sids2xids.(nt4_dc:local)(nt4_dc:local)
[531(2417)/563 at 18m55s] 
samba.ntlm_auth.diagnostics(nt4_dc:local)(nt4_dc:local)
[532(2418)/563 at 18m55s] samba.ntlm_auth.(nt4_dc:local)(nt4_dc:local)
[533(2437)/563 at 18m56s] samba.wbinfo_simple.ping(nt4_member:local)
[534(2438)/563 at 18m57s] samba.wbinfo_simple.separator(nt4_member:local)
[535(2439)/563 at 18m57s] samba.wbinfo_simple.own-domain(nt4_member:local)
[536(2440)/563 at 18m57s] samba.wbinfo_simple.all-domains(nt4_member:local)
[537(2441)/563 at 18m57s] samba.wbinfo_simple.trusted-domains(nt4_member:local)
[538(2442)/563 at 18m57s] 
samba.wbinfo_simple.domain-info=BUILTIN(nt4_member:local)
[539(2443)/563 at 18m57s] 
samba.wbinfo_simple.domain-info=$DOMAIN(nt4_member:local)
[540(2444)/563 at 18m57s] samba.wbinfo_simple.online-status(nt4_member:local)
[541(2445)/563 at 18m57s] 
samba.wbinfo_simple.online-status.domain=BUILTIN(nt4_member:local)
[542(2446)/563 at 18m57s] 
samba.wbinfo_simple.online-status.domain=$DOMAIN(nt4_member:local)
[543(2447)/563 at 18m57s] 
samba.wbinfo_simple.check-secret.domain=$DOMAIN(nt4_member:local)
UNEXPECTED(failure): 
samba.wbinfo_simple.check-secret.domain=SAMBA-TEST.wbinfo(nt4_member:local)
REASON: Exception: Exception: wbcCheckTrustCredentials(SAMBA-TEST): error code 
was NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND (0xc233)
failed to call wbcCheckTrustCredentials: WBC_ERR_AUTH_ERROR
Could not check secret
checking the trust secret for domain SAMBA-TEST via RPC calls failed

FAILED (1 failures, 0 errors and 0 unexpected successes in 0 testsuites)

A summary with detailed information can be found in:
  ./bin/ab/summary
TOP 10 slowest tests
samba3.raw.notify(nt4_dc) -> 98
samba3.smb2.notify(nt4_dc) -> 79
samba3.rpc.samr.passwords.lockout(nt4_dc) -> 61
samba4.rpc.echo on ncacn_np with object(nt4_dc) -> 60
samba3.rpc.samr.passwords.pwdlastset(nt4_dc) -> 49
samba3.smb2.lease(nt4_dc) -> 45
samba3.raw.oplock(nt4_dc) -> 42
samba3.smb2.oplock(nt4_dc) -> 41
samba3.raw.search(nt4_dc) -> 36
samba3.blackbox.net.rpc.conf(nt4_dc) -> 32
ERROR: test failed with exit code 1

[SCM] Samba Shared Repository - branch master updated

2018-08-09 Thread Andrew Bartlett 
The branch, master has been updated
   via  1a86733 provision: Add support for BIND 9.12.x
   via  94ffd4b dlz-bind: Add support for BIND 9.12.x
  from  9c13125 s3/smbd: Ensure quota code is only called when quota 
support detected

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


- Log -
commit 1a86733d034019083cadb137cb81dba661f96b66
Author: Amitay Isaacs 
Date:   Wed Aug 8 19:44:38 2018 +1000

provision: Add support for BIND 9.12.x

Signed-off-by: Amitay Isaacs 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Fri Aug 10 05:36:19 CEST 2018 on sn-devel-144

commit 94ffd4b7ad6680d0352d5cbdcda7dd61fd981809
Author: Amitay Isaacs 
Date:   Wed Aug 8 19:43:03 2018 +1000

dlz-bind: Add support for BIND 9.12.x

Signed-off-by: Amitay Isaacs 
Reviewed-by: Andrew Bartlett 

---

Summary of changes:
 python/samba/provision/sambadns.py |  6 +-
 source4/dns_server/dlz_minimal.h   |  3 +++
 source4/dns_server/wscript_build   | 10 ++
 source4/setup/named.conf.dlz   |  3 +++
 4 files changed, 21 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/provision/sambadns.py 
b/python/samba/provision/sambadns.py
index e2b6fcd..a04d8b8 100644
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -953,6 +953,7 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, 
logger):
 bind9_9 = '#'
 bind9_10 = '#'
 bind9_11 = '#'
+bind9_12 = '#'
 if bind_info.upper().find('BIND 9.8') != -1:
 bind9_8 = ''
 elif bind_info.upper().find('BIND 9.9') != -1:
@@ -961,6 +962,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, 
logger):
 bind9_10 = ''
 elif bind_info.upper().find('BIND 9.11') != -1:
 bind9_11 = ''
+elif bind_info.upper().find('BIND 9.12') != -1:
+bind9_12 = ''
 elif bind_info.upper().find('BIND 9.7') != -1:
 raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
 else:
@@ -971,7 +974,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, 
logger):
 "BIND9_8" : bind9_8,
 "BIND9_9" : bind9_9,
 "BIND9_10" : bind9_10,
-"BIND9_11" : bind9_11
+"BIND9_11" : bind9_11,
+"BIND9_12" : bind9_12
 })
 
 
diff --git a/source4/dns_server/dlz_minimal.h b/source4/dns_server/dlz_minimal.h
index 89ada7a..193904f 100644
--- a/source4/dns_server/dlz_minimal.h
+++ b/source4/dns_server/dlz_minimal.h
@@ -34,6 +34,9 @@
 #elif defined (BIND_VERSION_9_11)
 # define DLZ_DLOPEN_VERSION 3
 # define DNS_CLIENTINFO_VERSION 2
+#elif defined (BIND_VERSION_9_12)
+# define DLZ_DLOPEN_VERSION 3
+# define DNS_CLIENTINFO_VERSION 2
 #else
 # error Unsupported BIND version
 #endif
diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build
index c01e618..0fd6aa8 100644
--- a/source4/dns_server/wscript_build
+++ b/source4/dns_server/wscript_build
@@ -58,6 +58,16 @@ bld.SAMBA_LIBRARY('dlz_bind9_11',
   deps='samba-hostconfig samdb-common gensec popt 
dnsserver_common',
   enabled=bld.AD_DC_BUILD_IS_ENABLED())
 
+bld.SAMBA_LIBRARY('dlz_bind9_12',
+  source='dlz_bind9.c',
+  cflags='-DBIND_VERSION_9_12',
+  private_library=True,
+  link_name='modules/bind9/dlz_bind9_12.so',
+  realname='dlz_bind9_12.so',
+  install_path='${MODULESDIR}/bind9',
+  deps='samba-hostconfig samdb-common gensec popt 
dnsserver_common',
+  enabled=bld.AD_DC_BUILD_IS_ENABLED())
+
 bld.SAMBA_LIBRARY('dlz_bind9_for_torture',
   source='dlz_bind9.c',
   cflags='-DBIND_VERSION_9_8',
diff --git a/source4/setup/named.conf.dlz b/source4/setup/named.conf.dlz
index 215af5a..9341d7e 100644
--- a/source4/setup/named.conf.dlz
+++ b/source4/setup/named.conf.dlz
@@ -21,5 +21,8 @@ dlz "AD DNS Zone" {
 
 # For BIND 9.11.x
 ${BIND9_11} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_11.so";
+
+# For BIND 9.12.x
+${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
 };
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2018-08-09 Thread Jeremy Allison 
The branch, master has been updated
   via  9c13125 s3/smbd: Ensure quota code is only called when quota 
support detected
  from  8479401 lib: Add support to parse MS Catalog files

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


- Log -
commit 9c13125467b03d3a5a862654c2bacacd1e32578d
Author: Noel Power 
Date:   Tue Aug 7 11:06:34 2018 +0100

s3/smbd: Ensure quota code is only called when quota support detected

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13563

Signed-off-by: Noel Power 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Fri Aug 10 02:43:33 CEST 2018 on sn-devel-144

---

Summary of changes:
 source3/smbd/smb2_getinfo.c | 5 +
 source3/smbd/smb2_setinfo.c | 5 +
 2 files changed, 10 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index 05c57db..7bded42 100644
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -523,6 +523,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX 
*mem_ctx,
}
 
case SMB2_GETINFO_QUOTA: {
+#ifdef HAVE_SYS_QUOTAS
struct smb2_query_quota_info info;
enum ndr_err_code err;
uint8_t *data = NULL;
@@ -602,6 +603,10 @@ static struct tevent_req 
*smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
status  = NT_STATUS_OK;
TALLOC_FREE(tmp_ctx);
break;
+#else
+   tevent_req_nterror(req, NT_STATUS_NOT_SUPPORTED);
+   return tevent_req_post(req, ev);
+#endif
}
 
default:
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index 7ed2423..9b4620a 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -556,6 +556,7 @@ static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX 
*mem_ctx,
 
case 0x04:/* SMB2_SETINFO_QUOTA */
{
+#ifdef HAVE_SYS_QUOTAS
struct file_quota_information info = {0};
SMB_NTQUOTA_STRUCT qt = {0};
enum ndr_err_code err;
@@ -588,6 +589,10 @@ static struct tevent_req 
*smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
}
status = NT_STATUS_OK;
break;
+#else
+   tevent_req_nterror(req, NT_STATUS_NOT_SUPPORTED);
+   return tevent_req_post(req, ev);
+#endif
}
default:
tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2018-08-09 Thread Andreas Schneider 
The branch, master has been updated
   via  8479401 lib: Add support to parse MS Catalog files
  from  4abf348 ctdb: add expiry test for ctdb_mutex_ceph_rados_helper

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


- Log -
commit 8479401b028fe61f514c42aa9d238c0c630f0d94
Author: Andreas Schneider 
Date:   Tue Dec 20 08:52:14 2016 +0100

lib: Add support to parse MS Catalog files

Signed-off-by: Andreas Schneider 

Autobuild-User(master): Andreas Schneider 
Autobuild-Date(master): Thu Aug  9 19:57:02 CEST 2018 on sn-devel-144

---

Summary of changes:
 lib/mscat/dumpmscat.c  |  188 +++
 lib/mscat/mscat.asn|  136 +++
 lib/mscat/mscat.h  |  105 ++
 lib/mscat/mscat_ctl.c  | 1194 
 lib/mscat/mscat_pkcs7.c|  284 +
 .../pwrap_compat.h => lib/mscat/mscat_private.h|   21 +-
 lib/mscat/wscript  |   44 +
 wscript|1 +
 wscript_build  |1 +
 9 files changed, 1962 insertions(+), 12 deletions(-)
 create mode 100644 lib/mscat/dumpmscat.c
 create mode 100644 lib/mscat/mscat.asn
 create mode 100644 lib/mscat/mscat.h
 create mode 100644 lib/mscat/mscat_ctl.c
 create mode 100644 lib/mscat/mscat_pkcs7.c
 copy third_party/pam_wrapper/pwrap_compat.h => lib/mscat/mscat_private.h (65%)
 create mode 100644 lib/mscat/wscript


Changeset truncated at 500 lines:

diff --git a/lib/mscat/dumpmscat.c b/lib/mscat/dumpmscat.c
new file mode 100644
index 000..eac2184
--- /dev/null
+++ b/lib/mscat/dumpmscat.c
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2016  Andreas Schneider 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see .
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+
+#include "mscat.h"
+
+static const char *mac_to_string(enum mscat_mac_algorithm algo) {
+   switch(algo) {
+   case MSCAT_MAC_NULL:
+   return "NULL";
+   case MSCAT_MAC_MD5:
+   return "MD5";
+   case MSCAT_MAC_SHA1:
+   return "SHA1";
+   case MSCAT_MAC_SHA256:
+   return "SHA256";
+   case MSCAT_MAC_SHA512:
+   return "SHA512";
+   case MSCAT_MAC_UNKNOWN:
+   return "UNKNOWN";
+   }
+
+   return "UNKNOWN";
+}
+
+int main(int argc, char *argv[]) {
+   TALLOC_CTX *mem_ctx;
+   const char *filename = NULL;
+   const char *ca_file = NULL;
+   struct mscat_pkcs7 *cat_pkcs7;
+   struct mscat_ctl *msctl;
+   unsigned int member_count = 0;
+   unsigned int attribute_count = 0;
+   unsigned int i;
+   int rc;
+
+   if (argc < 1) {
+   return -1;
+   }
+   filename = argv[1];
+
+   if (filename == NULL || filename[0] == '\0') {
+   return -1;
+   }
+
+   mem_ctx = talloc_init("dumpmscat");
+   if (mem_ctx == NULL) {
+   fprintf(stderr, "Failed to initialize talloc\n");
+   exit(1);
+   }
+
+   /* READ MS ROOT CERTIFICATE */
+
+   cat_pkcs7 = mscat_pkcs7_init(mem_ctx);
+   if (cat_pkcs7 == NULL) {
+   exit(1);
+   }
+
+   rc = mscat_pkcs7_import_catfile(cat_pkcs7,
+   filename);
+   if (rc != 0) {
+   exit(1);
+   }
+
+   if (argc >= 2) {
+   ca_file = argv[2];
+   }
+
+   rc = mscat_pkcs7_verify(cat_pkcs7, ca_file);
+   if (rc != 0) {
+   printf("FAILED TO VERIFY CATALOG FILE!\n");
+   exit(1);
+   }
+   printf("CATALOG FILE VERIFIED!\n\n");
+
+   msctl = mscat_ctl_init(mem_ctx);
+   if (msctl == NULL) {
+   exit(1);
+   }
+
+   rc = mscat_ctl_import(msctl, cat_pkcs7);
+   if (rc != 0) {
+   exit(1);
+   }
+
+   member_count = mscat_ctl_get_member_count(msctl);
+   printf("CATALOG MEMBER COUNT=%d\n", member_count);
+
+   for (i = 0; i <

[SCM] Samba Shared Repository - branch master updated

2018-08-09 Thread David Disseldorp 
The branch, master has been updated
   via  4abf348 ctdb: add expiry test for ctdb_mutex_ceph_rados_helper
   via  ce289e8 ctdb_mutex_ceph_rados_helper: fix deadlock via lock renewals
   via  91a89c1 ctdb_mutex_ceph_rados_helper: rename timer_ev to 
ppid_timer_ev
   via  8d30fd5 ctdb_mutex_ceph_rados_helper: use talloc destructor for 
cleanup
   via  85706bd ctdb_mutex_ceph_rados_helper: Set SIGINT signal handler
   via  bd64af6 ctdb/build: link ctdb_mutex_ceph_rados_helper against 
ceph-common
  from  9b10565 Shorten description in vfs_linux_xfs_sgid manual

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


- Log -
commit 4abf348ec4cbb78d3216d5e8c5f3020d4499f10a
Author: David Disseldorp 
Date:   Fri Jul 20 17:20:08 2018 +0200

ctdb: add expiry test for ctdb_mutex_ceph_rados_helper

Kill the ctdb_mutex_ceph_rados_helper with SIGKILL and then confirm
that the lock is automatically released following expiry.

Signed-off-by: David Disseldorp 
Reviewed-by: Samuel Cabrero 
Reviewed-by: Amitay Isaacs 

Autobuild-User(master): David Disseldorp 
Autobuild-Date(master): Thu Aug  9 16:26:36 CEST 2018 on sn-devel-144

commit ce289e89e5c469cf2c5626dc7f2666b945dba3bd
Author: David Disseldorp 
Date:   Thu Jul 19 11:55:23 2018 +0200

ctdb_mutex_ceph_rados_helper: fix deadlock via lock renewals

RADOS locks without expiry persist indefinitely. This results in CTDB
deadlock during failover if the recovery master dies unexpectedly, as
subsequently elected recovery master nodes can't obtain the recovery
lock.
Avoid deadlock by using a lock expiration time (10s by default), and
renewing it periodically.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13540

Signed-off-by: David Disseldorp 
Reviewed-by: Samuel Cabrero 
Reviewed-by: Amitay Isaacs 

commit 91a89c146453ca203a83dc2ba555bb93276c4d7f
Author: David Disseldorp 
Date:   Tue Jul 17 23:36:36 2018 +0200

ctdb_mutex_ceph_rados_helper: rename timer_ev to ppid_timer_ev

In preparation for adding a lock refresh timer.

Signed-off-by: David Disseldorp 
Reviewed-by: Samuel Cabrero 
Reviewed-by: Amitay Isaacs 

commit 8d30fd591600ac17c742cd78c7bc4056bba6b877
Author: David Disseldorp 
Date:   Thu Jul 19 18:46:27 2018 +0200

ctdb_mutex_ceph_rados_helper: use talloc destructor for cleanup

Signed-off-by: David Disseldorp 
Reviewed-by: Samuel Cabrero 
Reviewed-by: Amitay Isaacs 

commit 85706bd27535eaa4ec653f99b1910fbd8f2aab88
Author: Samuel Cabrero 
Date:   Fri Jun 15 18:15:53 2018 +0200

ctdb_mutex_ceph_rados_helper: Set SIGINT signal handler

Set a handler for SIGINT to release the lock.

Signed-off-by: Samuel Cabrero 
Reviewed-by: David Disseldorp 
Reviewed-by: Amitay Isaacs 

commit bd64af6b8861f892e6ae2840a493f037d1e0a06c
Author: David Disseldorp 
Date:   Mon Jul 9 14:53:00 2018 +0200

ctdb/build: link ctdb_mutex_ceph_rados_helper against ceph-common

ceph-common linkage is needed with new versions of Ceph.
Also respect the --libcephfs_dir= parameter when provided.

Signed-off-by: David Disseldorp 
Reviewed-by: Amitay Isaacs 

---

Summary of changes:
 ctdb/utils/ceph/ctdb_mutex_ceph_rados_helper.c | 200 ++---
 ctdb/utils/ceph/test_ceph_rados_reclock.sh |  57 ++-
 ctdb/wscript   |  14 +-
 3 files changed, 218 insertions(+), 53 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/utils/ceph/ctdb_mutex_ceph_rados_helper.c 
b/ctdb/utils/ceph/ctdb_mutex_ceph_rados_helper.c
index 326a0b0..7ef76c2 100644
--- a/ctdb/utils/ceph/ctdb_mutex_ceph_rados_helper.c
+++ b/ctdb/utils/ceph/ctdb_mutex_ceph_rados_helper.c
@@ -1,7 +1,7 @@
 /*
CTDB mutex helper using Ceph librados locks
 
-   Copyright (C) David Disseldorp 2016
+   Copyright (C) David Disseldorp 2016-2018
 
Based on ctdb_mutex_fcntl_helper.c, which is:
Copyright (C) Martin Schwenke 2015
@@ -29,6 +29,11 @@
 #define CTDB_MUTEX_CEPH_LOCK_NAME  "ctdb_reclock_mutex"
 #define CTDB_MUTEX_CEPH_LOCK_COOKIECTDB_MUTEX_CEPH_LOCK_NAME
 #define CTDB_MUTEX_CEPH_LOCK_DESC  "CTDB recovery lock"
+/*
+ * During failover it may take up to  seconds before the
+ * newly elected recovery master can obtain the lock.
+ */
+#define CTDB_MUTEX_CEPH_LOCK_DURATION_SECS_DEFAULT 10
 
 #define CTDB_MUTEX_STATUS_HOLDING "0"
 #define CTDB_MUTEX_STATUS_CONTENDED "1"
@@ -88,24 +93,20 @@ static int ctdb_mutex_rados_ctx_create(const char 
*ceph_cluster_name,
return 0;
 }
 
-static void ctdb_mutex_rados_ctx_destroy(rados_t ceph_cluster,
-rados_ioctx_t ioctx)
-{
-   rados_ioctx_destroy(ioctx);
-   rados_shutdown(ceph_cluster);
-}
-
 static int

[SCM] NSS Wrapper Repository - branch master updated

2018-08-09 Thread Andreas Schneider 
The branch, master has been updated
   via  2d57b2a ctest: Move to new dashboard
   via  31fa6a7 nwrap: Update header
   via  35c8ff2 Update LICENSE file
   via  fb1ef75 Rename COPYING to LICENSE
   via  c6d06bf nwrap: Print errno when hsearch() returns NULL
   via  853ae24 tests: Add musl-libc 1.1 compatibility (gethostent())
   via  54fb274 tests: Add musl-libc 1.1 compatibility (getaddrinfo(), 
EAI_SERVICE)
   via  8ba1653 tests: Add musl-libc 1.1 compatibility (getaddrinfo(), 
IP-addresses)
   via  f8bb2de cpack: Do not package build dirs in source tarball
   via  52c79f2 cmake: Replace deprecated get_target_property()
  from  4298e3f nwrap: Fix strotoul checks for NSS_WRAPPER_MAX_HOSTENTS

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


- Log -
commit 2d57b2a56ddcfc229e0b6445c534c558094e336b
Author: Andreas Schneider 
Date:   Thu Jul 5 10:15:11 2018 +0200

ctest: Move to new dashboard

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 31fa6a7c7a9453d91ef4683581814fb02c2a3a45
Author: Andreas Schneider 
Date:   Fri Jun 22 08:46:06 2018 +0200

nwrap: Update header

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 35c8ff28450ec5dbd16d9619cac936db9e00ee3d
Author: Andreas Schneider 
Date:   Fri Jun 22 08:34:27 2018 +0200

Update LICENSE file

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit fb1ef750dc442a561e17536b8212261841478536
Author: Andreas Schneider 
Date:   Fri Jun 22 08:32:43 2018 +0200

Rename COPYING to LICENSE

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit c6d06bf617d25cb2b751853f5c6af0fe0e152f69
Author: Andreas Schneider 
Date:   Mon Jan 22 17:30:33 2018 +0100

nwrap: Print errno when hsearch() returns NULL

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 853ae24558611ee7738e60ecd0e4d805df7c6b00
Author: Dennis Schridde 
Date:   Wed Jan 25 22:25:24 2017 +0100

tests: Add musl-libc 1.1 compatibility (gethostent())

musl-libc stubs gethostent() and replies with NULL in any case. Thus we 
have to
 check the sensibility of the function before performing tests.

Tested with musl-libc 1.1.16-r13 on Alpine Linux 3.6. Also confirmed to not
 break with GNU libc 2.23-0ubuntu9 on Ubuntu 16.04.3 LTS.

Signed-Off-By: Dennis Schridde 
Reviewed-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 54fb2748b2e0f720017982678d50357e90b695d9
Author: Dennis Schridde 
Date:   Thu Aug 3 11:34:07 2017 +0200

tests: Add musl-libc 1.1 compatibility (getaddrinfo(), EAI_SERVICE)

The tests of getaddrinfo() had to be adapted, because musl-libc, unlike 
glibc
 and others, returns EAI_SERVICE if the requested service is not available 
for
 the requested socket type.

Tested with musl-libc 1.1.16-r13 on Alpine Linux 3.6. Also confirmed to not
 break with GNU libc 2.23-0ubuntu9 on Ubuntu 16.04.3 LTS.

Signed-Off-By: Dennis Schridde 
Reviewed-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 8ba16534b6f02c6337106cc17ced3c1f48b903fa
Author: Dennis Schridde 
Date:   Wed Jan 25 22:25:24 2017 +0100

tests: Add musl-libc 1.1 compatibility (getaddrinfo(), IP-addresses)

The tests of getaddrinfo() had to be adapted, because musl-libc, unlike 
glibc
 and others, replies with the same canonical name that was used in the 
original
 request, if the requested "node" was an IP-address

Tested with musl-libc 1.1.16-r13 on Alpine Linux 3.6. Also confirmed to not
 break with GNU libc 2.23-0ubuntu9 on Ubuntu 16.04.3 LTS.

Signed-Off-By: Dennis Schridde 
Reviewed-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit f8bb2dea54ac9f4276b73befcb83fdf0d120d6ba
Author: Andreas Schneider 
Date:   Fri Jun 22 09:00:30 2018 +0200

cpack: Do not package build dirs in source tarball

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 52c79f2e0284baa04a180280dc92875cef13f757
Author: Andreas Schneider 
Date:   Fri Jun 22 08:55:40 2018 +0200

cmake: Replace deprecated get_target_property()

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

---

Summary of changes:
 CPackConfig.cmake   |  4 +--
 CTestConfig.cmake   |  6 ++--
 ConfigureChecks.cmake   | 69 +
 COPYING => LICENSE  |  9 --
 src/CMakeLists.txt  |  7 +
 src/nss_wrapper.c   | 13 ++---
 tests/test_getaddrinfo.c| 20 +
 tests/test_nwrap_disabled.c | 12 
 8 files changed, 122 insertions(+), 18 deletions(-)
 rename COPYING => LICENSE (82%)


Changeset

[SCM] Socket Wrapper Repository - branch master updated

2018-08-09 Thread Andreas Schneider 
The branch, master has been updated
   via  93d4387 ctest: Move to new dashboard
   via  f0f8640 swrap: Add error check around pthread mutex locks
   via  1551444 tests: Prevent child process falling to defunct state
   via  326ae3b doc: Add SOCKET_WRAPPER_MAX_SOCKETS to manual page
   via  8ba0d9c swrap: Fix thread deadlock found by Coverity scan
   via  4d732f6 tests: Add missing header for IPPROTO_TCP
   via  32c1b58 swrap: Update header
   via  50fc189 Update LICENSE
   via  6c3e3b3 Rename COPYING to LICENSE
   via  f8b725a cpack: Do not package build dirs in source tarball
  from  5529ba0 swrap: Replace socket_fds linked list with an array

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


- Log -
commit 93d4387c27efb2b62bdc4240f66b2030f82c7705
Author: Andreas Schneider 
Date:   Thu Jul 5 10:14:14 2018 +0200

ctest: Move to new dashboard

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit f0f86400b6a9b9b8fc7ffddc24c64000f7b6866f
Author: Anoop C S 
Date:   Tue Jun 12 20:19:34 2018 +0530

swrap: Add error check around pthread mutex locks

Signed-off-by: Anoop C S 
Reviewed-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 1551444228d7e0a0b0e1028dabd23d92fb8f2834
Author: Anoop C S 
Date:   Wed Jun 27 23:35:28 2018 +0530

tests: Prevent child process falling to defunct state

Parent process does not wait for child process(which gets forked after
accepting a client connection) to exit inside echo server which in turn
puts child into defunct state. Even though those defunct childs are
cleaned up during parent exit it is better to wait from parent process
itself.

Signed-off-by: Anoop C S 
Reviewed-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 326ae3b98f766b95ccc83717896acb8651ec2ab2
Author: Anoop C S 
Date:   Mon Jun 25 19:15:44 2018 +0530

doc: Add SOCKET_WRAPPER_MAX_SOCKETS to manual page

Signed-off-by: Anoop C S 
Reviewed-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 8ba0d9cf9769579f3c68f78b33477c10aa133e8c
Author: Anoop C S 
Date:   Fri Jun 15 12:36:54 2018 +0530

swrap: Fix thread deadlock found by Coverity scan

CID 175897
CID 175898

Signed-off-by: Anoop C S 
Reviewed-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 4d732f6d037cfc2ca3c44c51081163b1d3e06b17
Author: Andreas Schneider 
Date:   Fri Jun 29 15:17:10 2018 +0200

tests: Add missing header for IPPROTO_TCP

This fixes the build on FreeBSD.

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 32c1b58590648becf179bea82eead158c324d7a7
Author: Andreas Schneider 
Date:   Fri Jun 22 08:47:08 2018 +0200

swrap: Update header

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 50fc18998e65be6012c59d69752978a21f5def49
Author: Andreas Schneider 
Date:   Fri Jun 22 08:42:06 2018 +0200

Update LICENSE

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit 6c3e3b3c816c5530c5be55ed9739fb87c9573e2d
Author: Andreas Schneider 
Date:   Fri Jun 22 08:38:04 2018 +0200

Rename COPYING to LICENSE

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

commit f8b725a982653824dbe4a580e15b2104fd18af4d
Author: Andreas Schneider 
Date:   Fri Jun 22 09:01:19 2018 +0200

cpack: Do not package build dirs in source tarball

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

---

Summary of changes:
 .gitignore  |   2 +-
 CPackConfig.cmake   |   4 +-
 CTestConfig.cmake   |   6 +-
 COPYING => LICENSE  |   9 ++-
 doc/socket_wrapper.1|  21 -
 doc/socket_wrapper.1.txt|  10 ++-
 src/socket_wrapper.c| 182 ++--
 tests/echo_srv.c|   2 +
 tests/test_thread_sockets.c |   1 +
 9 files changed, 165 insertions(+), 72 deletions(-)
 rename COPYING => LICENSE (82%)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 5d8f581..21038a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,6 @@
 *.swp
 *~
 build
-obj
+obj*/
 cscope.*
 tags
diff --git a/CPackConfig.cmake b/CPackConfig.cmake
index dc74dfa..e1b83ac 100644
--- a/CPackConfig.cmake
+++ b/CPackConfig.cmake
@@ -7,7 +7,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The SSH library")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
 set(CPACK_PACKAGE_VENDOR "The SSH Library Development Team")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 
 
 ### versions
@@ -19,7