[SCM] Samba Shared Repository - branch master updated

2016-07-25 Thread Garming Sam 
The branch, master has been updated
   via  8dabd57 kcc: Clean up repsTo attribute for old DCs
   via  9427a24 kcc: Add a TODO for msDS[-RO]-Replica-Locations
   via  f95bbc7 kcc: Add corresponding methods for repsTo
  from  3cb659e WHATSNEW: CTDB updates

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


- Log -
commit 8dabd57d1c2908a18c1b9eb70f54215653f73ee6
Author: Garming Sam 
Date:   Mon Jul 25 12:51:13 2016 +1200

kcc: Clean up repsTo attribute for old DCs

Signed-off-by: Garming Sam 
Reviewed-by: Andrew Bartlett 

Autobuild-User(master): Garming Sam 
Autobuild-Date(master): Tue Jul 26 05:11:57 CEST 2016 on sn-devel-144

commit 9427a2424ae4bb3250b35e3a38f3afda14a7bd0f
Author: Garming Sam 
Date:   Fri Jul 22 16:33:12 2016 +1200

kcc: Add a TODO for msDS[-RO]-Replica-Locations

When you modify the replica locations to exclude a DSA, it should be 
respected.

Signed-off-by: Garming Sam 
Reviewed-by: Andrew Bartlett 

commit f95bbc7933c71474b2b9796463e72bdde2442c77
Author: Garming Sam 
Date:   Fri Jul 22 14:14:20 2016 +1200

kcc: Add corresponding methods for repsTo

Signed-off-by: Garming Sam 
Reviewed-by: Andrew Bartlett 

---

Summary of changes:
 python/samba/kcc/__init__.py  | 71 +++
 python/samba/kcc/kcc_utils.py | 98 +++
 2 files changed, 169 insertions(+)


Changeset truncated at 500 lines:

diff --git a/python/samba/kcc/__init__.py b/python/samba/kcc/__init__.py
index 7b5b90d..9b29ef0 100644
--- a/python/samba/kcc/__init__.py
+++ b/python/samba/kcc/__init__.py
@@ -922,10 +922,13 @@ class KCC(object):
  len(needed_rep_table), len(delete_reps)))
 
 if delete_reps:
+# TODO Must delete repsFrom/repsTo for these replicas
 DEBUG('deleting these reps: %s' % delete_reps)
 for dnstr in delete_reps:
 del current_rep_table[dnstr]
 
+# HANDLE REPS-FROM
+#
 # Now perform the scan of replicas we'll need
 # and compare any current repsFrom against the
 # connections
@@ -1038,6 +1041,74 @@ class KCC(object):
 # Commit any modified repsFrom to the NC replica
 n_rep.commit_repsFrom(self.samdb)
 
+# HANDLE REPS-TO:
+#
+# Now perform the scan of replicas we'll need
+# and compare any current repsTo against the
+# connections
+
+# RODC should never push to anybody (should we check this?)
+if ro:
+return
+
+for n_rep in needed_rep_table.values():
+
+# load any repsTo and fsmo roles as we'll
+# need them during connection translation
+n_rep.load_repsTo(self.samdb)
+
+# Loop thru the existing repsTo tuples (if any)
+# XXX This is a list and could contain duplicates
+# (multiple load_repsTo calls)
+for t_repsTo in n_rep.rep_repsTo:
+
+# for each tuple t in n!repsTo, let s be the nTDSDSA
+# object such that s!objectGUID = t.uuidDsa
+guidstr = str(t_repsTo.source_dsa_obj_guid)
+s_dsa = self.get_dsa_by_guidstr(guidstr)
+
+# Source dsa is gone from config (strange)
+# so cleanup stale repsTo for unlisted DSA
+if s_dsa is None:
+logger.warning("repsTo source DSA guid (%s) not found" %
+   guidstr)
+t_repsTo.to_be_deleted = True
+continue
+
+# Find the connection that this repsTo would use. If
+# there isn't a good one (i.e. non-RODC_TOPOLOGY,
+# meaning non-FRS), we delete the repsTo.
+s_dnstr = s_dsa.dsa_dnstr
+if '\\0ADEL' in s_dnstr:
+logger.warning("repsTo source DSA guid (%s) appears 
deleted" %
+   guidstr)
+t_repsTo.to_be_deleted = True
+continue
+
+connections = 
s_dsa.get_connection_by_from_dnstr(self.my_dsa_dnstr)
+if len(connections) > 0:
+# Then this repsTo is tentatively valid
+continue
+else:
+# There is no plausible connection for this repsTo
+t_repsTo.to_be_deleted = True
+
+if self.readonly:
+# Display any to be deleted or modified repsTo
+text =

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

2016-07-25 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:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2016-07-26-0504/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2016-07-26-0504/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2016-07-26-0504/samba.stdout
  
The top commit at the time of the failure was:

commit 3cb659e1edbcad5293ee4a9eb9ab10d51a802a8c
Author: Martin Schwenke 
Date:   Tue May 31 15:50:25 2016 +1000

WHATSNEW: CTDB updates

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

Autobuild-User(master): Amitay Isaacs 
Autobuild-Date(master): Tue Jul 26 01:21:57 CEST 2016 on sn-devel-144

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

2016-07-25 Thread autobuild 
The autobuild test system (on sn-devel-104) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-26-0404/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-26-0404/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-26-0404/samba.stdout
  
The top commit at the time of the failure was:

commit 3cb659e1edbcad5293ee4a9eb9ab10d51a802a8c
Author: Martin Schwenke 
Date:   Tue May 31 15:50:25 2016 +1000

WHATSNEW: CTDB updates

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

Autobuild-User(master): Amitay Isaacs 
Autobuild-Date(master): Tue Jul 26 01:21:57 CEST 2016 on sn-devel-144

[SCM] Samba Shared Repository - branch master updated

2016-07-25 Thread Amitay Isaacs 
The branch, master has been updated
   via  3cb659e WHATSNEW: CTDB updates
   via  0e1ff5f ctdb-tests: Add database related tool tests
   via  6a01251 ctdb-tests: Implement database related controls in 
fake_ctdbd
   via  74989b1 ctdb-tools: Simplify "ctdb getdbseqnum" output format
   via  41d1347 ctdb-tests: Add "ctdb disable/enable" tool tests
   via  58f3bd3 ctdb-tests: Implement MODIFY_FLAGS control in fake_ctdbd
   via  ae07e3b ctdb-tests: Add "ctdb ban/unban" tool tests
   via  3d6c23e ctdb-tests: Implement SET_BAN_STATE control in fake_ctdbd
   via  bd17dae ctdb-tests: Add "ctdb stop/continue" tool tests
   via  8deb57b ctdb-tests: Implement TAKEOVER_RUN message in fake_ctdbd
   via  f7a9d59 ctdb-tests: Implement STOP_NODE and CONTINUE_NODE controls 
in fake_ctdbd
   via  8ef7168 ctdb-tests: Add "ctdb getreclock" tool tests
   via  0e8416d ctdb-tests: Implement GET_RECLOCK_FILE control in fake_ctdbd
   via  98f5172 ctdb-tests: Add "ctdb 
getmonmode/disablemonitor/enablemonitor" tool tests
   via  87bf242 ctdb-tests: Add monitoring related controls in fake_ctdbd
   via  7303d7b ctdb-tools: Simplify "ctdb getmonmode" output format
   via  c0d1e9c ctdb-tests: Add "ctdb setifacelink" tool tests
   via  435cf16 ctdb-tests: Implement SET_IFACE_LINK_STATE control in 
fake_ctdbd
   via  5d63d8d ctdb-tests: Add "ctdb listvars/getvar/setvar" tool tests
   via  be0db16 ctdb-tests: Implement controls related to tunables in 
fake_ctdbd
   via  abd5d7c ctdb-daemon: Use refactored tunable code
   via  f79be2e ctdb-common: Refactor tunable related functions
   via  37d321c ctdb-tests: Add "ctdb runstate" tool tests
   via  eb2544e ctdb-tests: Implement GET_RUNSTATE control in fake_ctdbd
   via  cf5d70c ctdb-tests: Add "ctdb setdebug" tool tests
   via  e7e3342 ctdb-tests: Implement GET_DEBUG and SET_DEBUG controls in 
fake_ctdbd
   via  6ee5136 ctdb-tool: Improve error output in "ctdb setdebug"
   via  b6623fe ctdb-tools: Simplify "ctdb getdebug" output format
   via  4af127c ctdb-tests: Add "ctdb pnn" tool test
   via  c3c106e ctdb-tools: Simplify "ctdb pnn" output format
   via  d6e1e69 ctdb-tests: Add "ctdb getpid" tool test
   via  accd1ca ctdb-tools: Simplify "ctdb getpid" output format
   via  032c9f1 ctdb-tests: Add "ctdb process-exists" tool test
   via  339da22 ctdb-tool: Simplify "ctdb process-exists"
   via  bde3f95 ctdb-tests: Add "ctdb uptime" tool test
   via  467356d ctdb-tool: Improve "ctdb uptime" output format
   via  55040c5 ctdb-tests: Add "ctdb recmaster" tool tests
   via  d30143d ctdb-tests: Add "ctdb ping" tool test
   via  48ed5f7 ctdb-tests: Add "ctdb ifaces" tool test
   via  e1aa2bb ctdb-tests: Fix "ctdb status" test
   via  1c44436 ctdb-tests: Drop a "ctdb reloadnodes" tool test
   via  1bb1b63 ctdb-tool: Fix a log message in "ctdb reloadnodes"
   via  fc7968d ctdb-tool: Exit with 1 on failure instead of -1
   via  02709c7 ctdb-tool: Drop arbitrary exit codes
   via  eafa12e ctdb-tests: Drop ctdb tool debug level to NOTICE
   via  2b2a7a9 ctdb-tool: Log a message at INFO level
   via  c77a50d ctdb-tests: Error on invalid destnode in fake_ctdbd
   via  046e566 ctdb-tests: Have fake_ctdbd log request IDs
   via  80f7fd1 ctdb-tests: Allow secondary tool commands to be tested
   via  752c70b ctdb-tests: Allow fake_ctdbd and tool to be run under 
valgrind in tool tests
   via  779a8d8 ctdb-tests: Clean up temporary files in tool tests
   via  c6f36b5 ctdb-tests: Require setup_ctdbd() call in tool tests
   via  2a85590 ctdb-doc: Document limitation of "ctdb reloadips"
   via  f427fe8 ctdb-doc: Update allowed debug levels to include "ERROR"
   via  99e41e8 ctdb-doc: Drop documentation for "ctdb xpnn"
   via  a66b83d ctdb-doc: Drop documentation for "ctdb setmonmode"
   via  fbce266 ctdb-build: Add missing dependency on samba-util
   via  9187f26 ctdb-locking: Remove ctdb_db_prio_iterator function
   via  b5ede50 ctdb-freeze: Remove ctdb_db_prio_frozen() function
   via  2852397 ctdb-locking: Remove API for locking databases with priority
   via  b81824e ctdb-locking: Remove API for locking all databases
   via  3927603 ctdb-daemon: Remove priority field from ctdb_db_context
   via  a7dd60e ctdb-protocol: Deprecate controls SET/GET_DB_PRIORITY
   via  7c8e933 ctdb-protocol: Drop marshalling code for set/get_db_priority
   via  b7233e3 ctdb-client: Remove code to set/get_db_priority from new 
client code
   via  bdb17fc ctdb-client: Remove client code for set/get_db_priority
   via  dc0bfcd ctdb-daemon: Remove implementation of SET/GET_DB_PRIORITY
   via  70d10ce ctdb-tool: Remove setdbprio and getdbprio commands
   via  2ac9d0a dbwrap_ctdb: Remove setting of database priority from samba
   via  6693fa5 ctdb-recoverd:

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

2016-07-25 Thread autobuild 
The autobuild test system (on sn-devel-104) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-26-0004/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-26-0004/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-26-0004/samba.stdout
  
The top commit at the time of the failure was:

commit f5e749414fd6bca8a7d1ed73ebb793d1bd98961c
Author: Alexander Bokovoy 
Date:   Sun Jul 24 15:47:33 2016 +0300

Wrap krb5_cc_copy_creds and krb5_cc_copy_cache

Heimdal and MIT Kerberos have different API to copy credentials from a
ccache. Wrap it via lib/krb5_wrap/.

Signed-off-by: Alexander Bokovoy 
Reviewed-by: Guenther Deschner 

Autobuild-User(master): Günther Deschner 
Autobuild-Date(master): Mon Jul 25 21:27:58 CEST 2016 on sn-devel-144

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

2016-07-25 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:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2016-07-25-2146/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2016-07-25-2146/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2016-07-25-2146/samba.stdout
  
The top commit at the time of the failure was:

commit 5505e36fc122e81607cd986493bda2821e24097d
Author: Garming Sam 
Date:   Mon Jul 25 12:51:29 2016 +1200

kcc: fix a typo

Signed-off-by: Garming Sam 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Mon Jul 25 17:42:33 CEST 2016 on sn-devel-144

[SCM] Samba Shared Repository - branch master updated

2016-07-25 Thread Günther Deschner 
The branch, master has been updated
   via  f5e7494 Wrap krb5_cc_copy_creds and krb5_cc_copy_cache
  from  5505e36 kcc: fix a typo

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


- Log -
commit f5e749414fd6bca8a7d1ed73ebb793d1bd98961c
Author: Alexander Bokovoy 
Date:   Sun Jul 24 15:47:33 2016 +0300

Wrap krb5_cc_copy_creds and krb5_cc_copy_cache

Heimdal and MIT Kerberos have different API to copy credentials from a
ccache. Wrap it via lib/krb5_wrap/.

Signed-off-by: Alexander Bokovoy 
Reviewed-by: Guenther Deschner 

Autobuild-User(master): Günther Deschner 
Autobuild-Date(master): Mon Jul 25 21:27:58 CEST 2016 on sn-devel-144

---

Summary of changes:
 auth/credentials/credentials_krb5.c |  4 ++--
 lib/krb5_wrap/krb5_samba.c  | 12 
 lib/krb5_wrap/krb5_samba.h  |  3 +++
 source4/heimdal_build/wscript_configure |  1 +
 wscript_configure_system_mitkrb5|  1 +
 5 files changed, 19 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/auth/credentials/credentials_krb5.c 
b/auth/credentials/credentials_krb5.c
index 0bd6595..82b6de9 100644
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -763,8 +763,8 @@ static int cli_credentials_shallow_ccache(struct 
cli_credentials *cred)
 
TALLOC_FREE(ccache_name);
 
-   ret = krb5_cc_copy_cache(ccc->smb_krb5_context->krb5_context,
-old_ccc->ccache, ccc->ccache);
+   ret = smb_krb5_cc_copy_creds(ccc->smb_krb5_context->krb5_context,
+old_ccc->ccache, ccc->ccache);
if (ret != 0) {
TALLOC_FREE(ccc);
return ret;
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 8064f17..2943b33 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -3039,6 +3039,18 @@ krb5_error_code krb5_warnx(krb5_context context, const 
char *fmt, ...)
 }
 #endif
 
+krb5_error_code smb_krb5_cc_copy_creds(krb5_context context,
+  krb5_ccache incc, krb5_ccache outcc)
+{
+#ifdef HAVE_KRB5_CC_COPY_CACHE /* Heimdal */
+   return krb5_cc_copy_cache(context, incc, outcc);
+#elif defined(HAVE_KRB5_CC_COPY_CREDS)
+   return krb5_cc_copy_creds(context, incc, outcc);
+#else
+#error UNKNOWN_KRB5_CC_COPY_CACHE_OR_CREDS_FUNCTION
+#endif
+}
+
 #else /* HAVE_KRB5 */
  /* this saves a few linking headaches */
  int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx,
diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index f988858..2d31619 100644
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -396,6 +396,9 @@ int smb_krb5_principal_get_type(krb5_context context,
 krb5_error_code krb5_warnx(krb5_context context, const char *fmt, ...);
 #endif
 
+krb5_error_code smb_krb5_cc_copy_creds(krb5_context context,
+  krb5_ccache incc, krb5_ccache outcc);
+
 #endif /* HAVE_KRB5 */
 
 int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx,
diff --git a/source4/heimdal_build/wscript_configure 
b/source4/heimdal_build/wscript_configure
index 79b461c..67ac34b 100755
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -104,6 +104,7 @@ conf.define('HAVE_INITIALIZE_KRB5_ERROR_TABLE', 1)
 conf.define('HAVE_KRB5_ADDRESSES', 1)
 conf.define('HAVE_KRB5_AUTH_CON_SETKEY', 1)
 conf.define('HAVE_KRB5_CC_GET_LIFETIME', 1)
+conf.define('HAVE_KRB5_CC_COPY_CACHE', 1)
 conf.define('HAVE_KRB5_CREATE_CHECKSUM', 1)
 conf.define('HAVE_KRB5_CRYPTO', 1)
 conf.define('HAVE_KRB5_CRYPTO_DESTROY', 1)
diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
index 0d47ccb..57a729d 100644
--- a/wscript_configure_system_mitkrb5
+++ b/wscript_configure_system_mitkrb5
@@ -118,6 +118,7 @@ conf.CHECK_FUNCS('''
krb5_get_init_creds_keyblock krb5_get_init_creds_keytab
krb5_make_principal krb5_build_principal_alloc_va
krb5_cc_get_lifetime krb5_cc_retrieve_cred
+   krb5_cc_copy_creds
krb5_free_checksum_contents krb5_c_make_checksum krb5_create_checksum
krb5_config_get_bool_default krb5_get_profile
krb5_data_copy


-- 
Samba Shared Repository

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

2016-07-25 Thread autobuild 
The autobuild test system (on sn-devel-104) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-25-2004/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-25-2004/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-25-2004/samba.stdout
  
The top commit at the time of the failure was:

commit 5505e36fc122e81607cd986493bda2821e24097d
Author: Garming Sam 
Date:   Mon Jul 25 12:51:29 2016 +1200

kcc: fix a typo

Signed-off-by: Garming Sam 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Mon Jul 25 17:42:33 CEST 2016 on sn-devel-144

[SCM] Samba Shared Repository - branch master updated

2016-07-25 Thread Volker Lendecke 
The branch, master has been updated
   via  5505e36 kcc: fix a typo
   via  1f1edb6 kcc: typo fix tupple => tuple
   via  1835cde AddressSanitizer: Initialize for vfs_fruit.c
   via  555db4b AddressSanitizer: Initialize for smbd/oplock.c
   via  1f4d935 AddressSanitizer: Initialize for kcc_topology.c
  from  3a683b1 vfs_gpfs: Retry getacl with DAC capability if necessary

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


- Log -
commit 5505e36fc122e81607cd986493bda2821e24097d
Author: Garming Sam 
Date:   Mon Jul 25 12:51:29 2016 +1200

kcc: fix a typo

Signed-off-by: Garming Sam 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Mon Jul 25 17:42:33 CEST 2016 on sn-devel-144

commit 1f1edb65bf9e09ec77fd10572f89de6b1e77445c
Author: Garming Sam 
Date:   Fri Jul 22 16:38:40 2016 +1200

kcc: typo fix tupple => tuple

Signed-off-by: Garming Sam 
Reviewed-by: Volker Lendecke 

commit 1835cde41353eb817a2b5b83f799f5daeb856a58
Author: Garming Sam 
Date:   Thu Jun 16 13:01:23 2016 +1200

AddressSanitizer: Initialize for vfs_fruit.c

Signed-off-by: Garming Sam 
Reviewed-by: Volker Lendecke 

commit 555db4b8dd26298734a00bba629bcdc1dc9204f1
Author: Garming Sam 
Date:   Thu Jun 16 13:00:20 2016 +1200

AddressSanitizer: Initialize for smbd/oplock.c

Signed-off-by: Garming Sam 
Reviewed-by: Volker Lendecke 

commit 1f4d9355a2bd19bb179df6ea239becb424e949da
Author: Garming Sam 
Date:   Fri Jul 22 10:56:07 2016 +1200

AddressSanitizer: Initialize for kcc_topology.c

Signed-off-by: Garming Sam 
Reviewed-by: Volker Lendecke 

---

Summary of changes:
 python/samba/kcc/__init__.py| 4 ++--
 python/samba/kcc/kcc_utils.py   | 2 +-
 source3/modules/vfs_fruit.c | 2 +-
 source3/smbd/oplock.c   | 2 +-
 source4/dsdb/kcc/kcc_topology.c | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/kcc/__init__.py b/python/samba/kcc/__init__.py
index e96ff83..7b5b90d 100644
--- a/python/samba/kcc/__init__.py
+++ b/python/samba/kcc/__init__.py
@@ -936,7 +936,7 @@ class KCC(object):
 n_rep.load_repsFrom(self.samdb)
 n_rep.load_fsmo_roles(self.samdb)
 
-# Loop thru the existing repsFrom tupples (if any)
+# Loop thru the existing repsFrom tuples (if any)
 # XXX This is a list and could contain duplicates
 # (multiple load_repsFrom calls)
 for t_repsFrom in n_rep.rep_repsFrom:
@@ -995,7 +995,7 @@ class KCC(object):
 if s_dsa is None:
 continue
 
-# Loop thru the existing repsFrom tupples (if any) and
+# Loop thru the existing repsFrom tuples (if any) and
 # if we already have a tuple for this connection then
 # no need to proceed to add.  It will have been changed
 # to have the correct attributes above
diff --git a/python/samba/kcc/kcc_utils.py b/python/samba/kcc/kcc_utils.py
index 1e00918..e624519 100644
--- a/python/samba/kcc/kcc_utils.py
+++ b/python/samba/kcc/kcc_utils.py
@@ -1368,7 +1368,7 @@ class Site(object):
 self.nt_now = nt_now
 
 def load_site(self, samdb):
-"""Loads the NTDS Site Settions options attribute for the site
+"""Loads the NTDS Site Settings options attribute for the site
 as well as querying and loading all DSAs that appear within
 the site.
 """
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 6d4389f..6e7899aa 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3650,7 +3650,7 @@ static NTSTATUS fruit_fset_nt_acl(vfs_handle_struct 
*handle,
 {
NTSTATUS status;
bool do_chmod;
-   mode_t ms_nfs_mode;
+   mode_t ms_nfs_mode = 0;
int result;
 
DBG_DEBUG("fruit_fset_nt_acl: %s\n", fsp_str_dbg(fsp));
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 4ce3a1d..be20dee 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -1143,7 +1143,7 @@ static void do_break_to_none(struct tevent_context *ctx,
 
for (i=0; inum_leases; i++) {
struct share_mode_lease *l = >leases[i];
-   struct share_mode_entry *e;
+   struct share_mode_entry *e = NULL;
uint32_t j;
 
if

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

2016-07-25 Thread autobuild 
The autobuild test system (on sn-devel-104) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-25-1603/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-25-1603/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-25-1603/samba.stdout
  
The top commit at the time of the failure was:

commit 3a683b10951e7a003ff27d4ceba381bfd5e686d5
Author: Christof Schmitt 
Date:   Wed May 25 22:56:49 2016 -0700

vfs_gpfs: Retry getacl with DAC capability if necessary

Samba always tries to read the ACL of a file and checks it internally.
If the READ_ACL permission is missing in GPFS, then then reading the ACL
for Samba internal evaluation will be denied and opening the file or
directory fails. Change this by retrying reading the ACL with the DAC
capability if access was denied.

Signed-off-by: Christof Schmitt 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Christof Schmitt 
Autobuild-Date(master): Mon Jul 25 10:30:02 CEST 2016 on sn-devel-144

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

2016-07-25 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:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2016-07-25-1514/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2016-07-25-1514/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2016-07-25-1514/samba.stdout
  
The top commit at the time of the failure was:

commit 3a683b10951e7a003ff27d4ceba381bfd5e686d5
Author: Christof Schmitt 
Date:   Wed May 25 22:56:49 2016 -0700

vfs_gpfs: Retry getacl with DAC capability if necessary

Samba always tries to read the ACL of a file and checks it internally.
If the READ_ACL permission is missing in GPFS, then then reading the ACL
for Samba internal evaluation will be denied and opening the file or
directory fails. Change this by retrying reading the ACL with the DAC
capability if access was denied.

Signed-off-by: Christof Schmitt 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Christof Schmitt 
Autobuild-Date(master): Mon Jul 25 10:30:02 CEST 2016 on sn-devel-144

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

2016-07-25 Thread autobuild 
The autobuild test system (on sn-devel-104) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-25-1203/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-25-1203/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-25-1203/samba.stdout
  
The top commit at the time of the failure was:

commit 3a683b10951e7a003ff27d4ceba381bfd5e686d5
Author: Christof Schmitt 
Date:   Wed May 25 22:56:49 2016 -0700

vfs_gpfs: Retry getacl with DAC capability if necessary

Samba always tries to read the ACL of a file and checks it internally.
If the READ_ACL permission is missing in GPFS, then then reading the ACL
for Samba internal evaluation will be denied and opening the file or
directory fails. Change this by retrying reading the ACL with the DAC
capability if access was denied.

Signed-off-by: Christof Schmitt 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Christof Schmitt 
Autobuild-Date(master): Mon Jul 25 10:30:02 CEST 2016 on sn-devel-144

[SCM] Samba Shared Repository - branch master updated

2016-07-25 Thread Christof Schmitt 
The branch, master has been updated
   via  3a683b1 vfs_gpfs: Retry getacl with DAC capability if necessary
  from  4c5367d s3: vfs: ceph: Add posix acl support

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


- Log -
commit 3a683b10951e7a003ff27d4ceba381bfd5e686d5
Author: Christof Schmitt 
Date:   Wed May 25 22:56:49 2016 -0700

vfs_gpfs: Retry getacl with DAC capability if necessary

Samba always tries to read the ACL of a file and checks it internally.
If the READ_ACL permission is missing in GPFS, then then reading the ACL
for Samba internal evaluation will be denied and opening the file or
directory fails. Change this by retrying reading the ACL with the DAC
capability if access was denied.

Signed-off-by: Christof Schmitt 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Christof Schmitt 
Autobuild-Date(master): Mon Jul 25 10:30:02 CEST 2016 on sn-devel-144

---

Summary of changes:
 source3/modules/vfs_gpfs.c | 30 --
 1 file changed, 28 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 42a3c72..f096dd5 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -358,6 +358,21 @@ static void gpfs_dumpacl(int level, struct gpfs_acl *gacl)
}
 }
 
+static int gpfs_getacl_with_capability(const char *fname, int flags, void *buf)
+{
+   int ret, saved_errno;
+
+   set_effective_capability(DAC_OVERRIDE_CAPABILITY);
+
+   ret = gpfswrap_getacl(discard_const_p(char, fname), flags, buf);
+   saved_errno = errno;
+
+   drop_effective_capability(DAC_OVERRIDE_CAPABILITY);
+
+   errno = saved_errno;
+   return ret;
+}
+
 /*
  * get the ACL from GPFS, allocated on the specified mem_ctx
  * internally retries when initial buffer was too small
@@ -378,6 +393,7 @@ static void *vfs_gpfs_getacl(TALLOC_CTX *mem_ctx,
int ret, flags;
unsigned int *len;
size_t struct_size;
+   bool use_capability = false;
 
 again:
 
@@ -406,8 +422,18 @@ again:
/* set the length of the buffer as input value */
*len = size;
 
-   errno = 0;
-   ret = gpfswrap_getacl(discard_const_p(char, fname), flags, aclbuf);
+   if (use_capability) {
+   ret = gpfs_getacl_with_capability(fname, flags, aclbuf);
+   } else {
+   ret = gpfswrap_getacl(discard_const_p(char, fname),
+ flags, aclbuf);
+   if ((ret != 0) && (errno == EACCES)) {
+   DBG_DEBUG("Retry with DAC capability for %s\n", fname);
+   use_capability = true;
+   ret = gpfs_getacl_with_capability(fname, flags, aclbuf);
+   }
+   }
+
if ((ret != 0) && (errno == ENOSPC)) {
/*
 * get the size needed to accommodate the complete buffer


-- 
Samba Shared Repository

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

2016-07-25 Thread autobuild 
The autobuild test system (on sn-devel-104) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-25-0804/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-25-0804/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-07-25-0804/samba.stdout
  
The top commit at the time of the failure was:

commit 4c5367d84b0b51d5597b652a59ba43688731572c
Author: Yan, Zheng 
Date:   Mon Mar 21 10:42:21 2016 +0800

s3: vfs: ceph: Add posix acl support

Signed-off-by: Yan, Zheng 
Signed-off-by: Ira Cooper 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Ira Cooper 
Autobuild-Date(master): Sun Jul 24 04:08:23 CEST 2016 on sn-devel-144