r21830: Fix header installation, remove proto header with a single prototype.

diff --git a/source/headermap.txt b/source/headermap.txt
index 6d848ac98e7be4cc9e8c0727e5aa425af284368f..c8e50a098538c6493a352ac986457f69fe2321b6 100644 (file)
--- a/source/headermap.txt
+++ b/source/headermap.txt
@@ -33,8 +33,6 @@ gtk/common/gtk-smb.h: gtk-smb.h
 gtk/common/select.h: gtk/select.h
 librpc/ndr/libndr.h: ndr.h
 lib/registry/registry.h: registry.h
-lib/registry/reg_backend_rpc.h: registry_rpc.h
-lib/registry/registry_proto.h: registry/proto.h
 libcli/util/nterr.h: core/nterr.h
 libcli/util/doserr.h: core/doserr.h
 libcli/util/nt_status.h: core/ntstatus.h

diff --git a/source/lib/registry/config.mk b/source/lib/registry/config.mk
index 78752ae988ec58adc9d146c3cd1e17363c981d90..fd38d3a4f910f314d799c82d43f252732db9b2e9 100644 (file)
--- a/source/lib/registry/config.mk
+++ b/source/lib/registry/config.mk
@@ -52,7 +52,6 @@ PUBLIC_DEPENDENCIES = LIBTALLOC
 # Start MODULE registry_rpc
 [MODULE::registry_rpc]
 INIT_FUNCTION = registry_rpc_init
-PUBLIC_PROTO_HEADER = reg_backend_rpc.h
 OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = registry
 OBJ_FILES = \

diff --git a/source/lib/registry/registry.h b/source/lib/registry/registry.h
index 7475720fcf2403a306cb1bf7be2e9d19b8a7ef51..509e66b5fdaf2bdf5bf5344df1c4a9fe4d31a2cf 100644 (file)
--- a/source/lib/registry/registry.h
+++ b/source/lib/registry/registry.h
@@ -188,6 +188,11 @@ _PUBLIC_ WERROR reg_open_local (TALLOC_CTX *mem_ctx,
                                struct auth_session_info *session_info, 
                                struct cli_credentials *credentials);
 
+_PUBLIC_ WERROR reg_open_remote(struct registry_context **ctx, 
+                                                               struct auth_session_info *session_info, 
+                                                               struct cli_credentials *credentials, 
+                                                               const char *location, struct event_context *ev);
+
 _PUBLIC_ NTSTATUS registry_register(const void *_hive_ops);
 _PUBLIC_ NTSTATUS registry_init(void);
 _PUBLIC_ BOOL reg_has_backend(const char *backend);
@@ -232,4 +237,6 @@ _PUBLIC_ WERROR reg_diff_save(const struct reg_diff *diff, const char *filename)
 _PUBLIC_ struct reg_diff *reg_diff_load(TALLOC_CTX *ctx, const char *fn);
 _PUBLIC_ BOOL reg_diff_apply (const struct reg_diff *diff, struct registry_context *ctx);
 
+NTSTATUS registry_rpc_init(void);
+
 #endif /* _REGISTRY_H */

diff --git a/source/torture/config.mk b/source/torture/config.mk
index fa13dcc0f1c6d0c7de88fb7d67006f77f08b020e..998c729160d40448f6913ddd80a9b0d04bac177c 100644 (file)
--- a/source/torture/config.mk
+++ b/source/torture/config.mk
@@ -161,7 +161,7 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
                NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
                RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
-               dcerpc_mgmt RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI \
+               RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI \
                RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
                RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
                RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBSAMBA-NET \