Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into registry

(This used to be commit e8d96b61db1cddc2d8dca45e6e9b53d5c31ee5d4)

diff --cc source4/lib/registry/hive.c
Simple merge

diff --cc source4/lib/registry/interface.c
Simple merge

diff --cc source4/lib/registry/local.c
index da381cfbff39dcea613e4f4ace9a0b9f0a8d0c8d,47d6d4cd32692224316e7d6f7fd7b489878d9480..4af95e2dd62d46fc9754bae51011934d675e9c45
--- 1/source4/lib/registry/local.c
--- 2/source4/lib/registry/local.c
+++ b/source4/lib/registry/local.c
@@@ -306,13 -288,9 +302,11 @@@ const static struct registry_operation
        .delete_value = local_delete_value,
        .flush_key = local_flush_key,
        .get_key_info = local_get_key_info,
 +      .get_sec_desc = local_get_sec_desc,
 +      .set_sec_desc = local_set_sec_desc,
  };
  
- WERROR reg_open_local(TALLOC_CTX *mem_ctx, struct registry_context **ctx,
-                     struct auth_session_info *session_info,
-                     struct cli_credentials *credentials)
+ WERROR reg_open_local(TALLOC_CTX *mem_ctx, struct registry_context **ctx)
  {
        struct registry_local *ret = talloc_zero(mem_ctx,
                                                 struct registry_local);

diff --cc source4/lib/registry/registry.h
Simple merge

diff --cc source4/lib/registry/tests/hive.c
Simple merge

diff --cc source4/lib/registry/tests/registry.c
Simple merge