From 0a3c167f6bcf08b2204ca49831ca49eef73dcbf4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 27 Dec 2005 22:51:30 +0000 Subject: r12528: Add seperate proto headers for ntvfs, tdr, smb_server and nbt_server. (This used to be commit 87f665a1d5ba74289974bf9d8f9441c162e6f1b1) --- source4/lib/basic.mk | 2 ++ source4/lib/registry/common/reg_interface.c | 16 ++++++++-------- source4/lib/registry/patchfile.c | 6 +++--- source4/lib/tdr/tdr.c | 1 + source4/lib/tdr/tdr.h | 2 ++ 5 files changed, 16 insertions(+), 11 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 4d2d1b08fd..b4bde76d3f 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -32,6 +32,7 @@ MAJOR_VERSION = 0 MINOR_VERSION = 0 RELEASE_VERSION = 1 DESCRIPTION = Simple marshall/unmarshall library +PRIVATE_PROTO_HEADER = tdr/tdr_proto.h OBJ_FILES = tdr/tdr.o ############################## @@ -62,6 +63,7 @@ OBJ_FILES = \ ############################## # Start SUBSYSTEM LIBBASIC [SUBSYSTEM::LIBBASIC] +PRIVATE_PROTO_HEADER = basic.h OBJ_FILES = version.o \ xfile.o \ debug.o \ diff --git a/source4/lib/registry/common/reg_interface.c b/source4/lib/registry/common/reg_interface.c index b0540c1ba4..00fa42d342 100644 --- a/source4/lib/registry/common/reg_interface.c +++ b/source4/lib/registry/common/reg_interface.c @@ -29,7 +29,7 @@ static struct reg_init_function_entry *backends = NULL; static struct reg_init_function_entry *reg_find_backend_entry(const char *name); /* Register new backend */ -NTSTATUS registry_register(const void *_hive_ops) +_PUBLIC_ NTSTATUS registry_register(const void *_hive_ops) { const struct hive_operations *hive_ops = _hive_ops; struct reg_init_function_entry *entry = backends; @@ -65,7 +65,7 @@ static struct reg_init_function_entry *reg_find_backend_entry(const char *name) return NULL; } -NTSTATUS registry_init(void) +_PUBLIC_ NTSTATUS registry_init(void) { init_module_fn static_init[] = STATIC_REGISTRY_MODULES; init_module_fn *shared_init = load_samba_modules(NULL, "registry"); @@ -101,7 +101,7 @@ static struct { { 0, NULL } }; -int reg_list_predefs(TALLOC_CTX *mem_ctx, char ***predefs, uint32_t **hkeys) +_PUBLIC_ int reg_list_predefs(TALLOC_CTX *mem_ctx, char ***predefs, uint32_t **hkeys) { int i; *predefs = talloc_array(mem_ctx, char *, ARRAY_SIZE(predef_names)); @@ -151,7 +151,7 @@ WERROR reg_get_predefined_key(struct registry_context *ctx, uint32_t hkey, struc } /* Open a registry file/host/etc */ -WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *backend, const char *location, const char *credentials, struct registry_key **root) +_PUBLIC_ WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *backend, const char *location, const char *credentials, struct registry_key **root) { struct registry_hive *rethive; struct registry_key *retkey = NULL; @@ -200,7 +200,7 @@ WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *backend, const char *lo * First tries to use the open_key function from the backend * then falls back to get_subkey_by_name and later get_subkey_by_index */ -WERROR reg_open_key(TALLOC_CTX *mem_ctx, struct registry_key *parent, const char *name, struct registry_key **result) +_PUBLIC_ WERROR reg_open_key(TALLOC_CTX *mem_ctx, struct registry_key *parent, const char *name, struct registry_key **result) { WERROR error; @@ -251,7 +251,7 @@ WERROR reg_open_key(TALLOC_CTX *mem_ctx, struct registry_key *parent, const char return WERR_OK; } -WERROR reg_key_get_value_by_index(TALLOC_CTX *mem_ctx, const struct registry_key *key, int idx, struct registry_value **val) +_PUBLIC_ WERROR reg_key_get_value_by_index(TALLOC_CTX *mem_ctx, const struct registry_key *key, int idx, struct registry_value **val) { if(!key) return WERR_INVALID_PARAM; @@ -434,7 +434,7 @@ WERROR reg_key_add_name(TALLOC_CTX *mem_ctx, const struct registry_key *parent, return WERR_OK; } -WERROR reg_val_set(struct registry_key *key, const char *value, uint32_t type, DATA_BLOB data) +_PUBLIC_ WERROR reg_val_set(struct registry_key *key, const char *value, uint32_t type, DATA_BLOB data) { /* A 'real' set function has preference */ if (key->hive->functions->set_value) @@ -455,7 +455,7 @@ WERROR reg_get_sec_desc(TALLOC_CTX *ctx, const struct registry_key *key, struct return WERR_NOT_SUPPORTED; } -WERROR reg_del_value(const struct registry_key *key, const char *valname) +_PUBLIC_ WERROR reg_del_value(const struct registry_key *key, const char *valname) { WERROR ret = WERR_OK; if(!key->hive->functions->del_value) diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c index dd118c780f..21c9c26b21 100644 --- a/source4/lib/registry/patchfile.c +++ b/source4/lib/registry/patchfile.c @@ -173,7 +173,7 @@ static WERROR reg_generate_diff_key(struct reg_diff *diff, struct registry_key * /* * Generate diff between two registry contexts */ -struct reg_diff *reg_generate_diff(TALLOC_CTX *mem_ctx, struct registry_context *ctx1, struct registry_context *ctx2) +_PUBLIC_ struct reg_diff *reg_generate_diff(TALLOC_CTX *mem_ctx, struct registry_context *ctx1, struct registry_context *ctx2) { struct reg_diff *diff = talloc_zero(mem_ctx, struct reg_diff); int i; @@ -202,7 +202,7 @@ struct reg_diff *reg_generate_diff(TALLOC_CTX *mem_ctx, struct registry_context /* * Save registry diff */ -WERROR reg_diff_save(const struct reg_diff *diff, const char *filename) +_PUBLIC_ WERROR reg_diff_save(const struct reg_diff *diff, const char *filename) { int xf, i, j; @@ -363,7 +363,7 @@ struct reg_diff *reg_diff_load(TALLOC_CTX *ctx, const char *fn) /* * Apply diff to a registry context */ -BOOL reg_diff_apply (const struct reg_diff *diff, struct registry_context *ctx) +_PUBLIC_ BOOL reg_diff_apply (const struct reg_diff *diff, struct registry_context *ctx) { TALLOC_CTX *mem_ctx = talloc_init("apply_cmd_file"); struct registry_key *tmp = NULL; diff --git a/source4/lib/tdr/tdr.c b/source4/lib/tdr/tdr.c index 4a8d05a8ab..5ebe3f0852 100644 --- a/source4/lib/tdr/tdr.c +++ b/source4/lib/tdr/tdr.c @@ -24,6 +24,7 @@ #include "includes.h" #include "system/network.h" #include "system/filesys.h" +#include "tdr/tdr.h" #define TDR_BASE_MARSHALL_SIZE 1024 diff --git a/source4/lib/tdr/tdr.h b/source4/lib/tdr/tdr.h index f882a63275..8ca6717cee 100644 --- a/source4/lib/tdr/tdr.h +++ b/source4/lib/tdr/tdr.h @@ -54,3 +54,5 @@ struct tdr_print { typedef NTSTATUS (*tdr_push_fn_t) (struct tdr_push *, const void *); typedef NTSTATUS (*tdr_pull_fn_t) (struct tdr_pull *, TALLOC_CTX *, void *); + +#include "tdr/tdr_proto.h" -- cgit