diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-03-13 20:44:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:49:33 -0500 |
| commit | 606c0fec4315bf10eb50b8ab656204b086446e3d (patch) | |
| tree | c9aadc6b2fd9f9d270b57db6aafa7804b3211c66 | |
| parent | 6bcbdc2757758f936ce03319c533bb480f4fdc37 (diff) | |
| download | samba-606c0fec4315bf10eb50b8ab656204b086446e3d.tar.gz samba-606c0fec4315bf10eb50b8ab656204b086446e3d.tar.bz2 samba-606c0fec4315bf10eb50b8ab656204b086446e3d.zip | |
r21830: Fix header installation, remove proto header with a single prototype.
(This used to be commit 47a17a741af625eb52f611b3d0f3ea0e207f2c3a)
| -rw-r--r-- | source4/headermap.txt | 2 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 1 | ||||
| -rw-r--r-- | source4/lib/registry/registry.h | 7 | ||||
| -rw-r--r-- | source4/torture/config.mk | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/source4/headermap.txt b/source4/headermap.txt index 6d848ac98e..c8e50a0985 100644 --- a/source4/headermap.txt +++ b/source4/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/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 78752ae988..fd38d3a4f9 100644 --- a/source4/lib/registry/config.mk +++ b/source4/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/source4/lib/registry/registry.h b/source4/lib/registry/registry.h index 7475720fcf..509e66b5fd 100644 --- a/source4/lib/registry/registry.h +++ b/source4/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/source4/torture/config.mk b/source4/torture/config.mk index fa13dcc0f1..998c729160 100644 --- a/source4/torture/config.mk +++ b/source4/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 \ |