diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-02 13:58:05 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-02 13:58:05 +0200 |
commit | 5be50a222facee943edae868e39ff11f7dd68965 (patch) | |
tree | cba545f1f683d65ae560a2e0ec9d373167022dd9 /source4/lib/registry/registry.h | |
parent | 236fc02913adafd80921d4e30aa6ee1e414bef44 (diff) | |
download | samba-5be50a222facee943edae868e39ff11f7dd68965.tar.gz samba-5be50a222facee943edae868e39ff11f7dd68965.tar.bz2 samba-5be50a222facee943edae868e39ff11f7dd68965.zip |
Merge patchfile.h into registry.h
(This used to be commit 7b434df67aefc667993f0ebd955af9c1c258f153)
Diffstat (limited to 'source4/lib/registry/registry.h')
-rw-r--r-- | source4/lib/registry/registry.h | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h index 5e0b971a1d..b76f2c4bcc 100644 --- a/source4/lib/registry/registry.h +++ b/source4/lib/registry/registry.h @@ -66,8 +66,6 @@ struct registry_key struct registry_context *context; }; -#include "lib/registry/patchfile.h" - struct registry_value { const char *name; @@ -285,5 +283,34 @@ WERROR reg_get_security(TALLOC_CTX *mem_ctx, WERROR reg_set_security(struct registry_key *key, struct security_descriptor *security); +struct reg_diff_callbacks { + WERROR (*add_key) (void *callback_data, const char *key_name); + WERROR (*set_value) (void *callback_data, const char *key_name, + const char *value_name, uint32_t value_type, + DATA_BLOB value); + WERROR (*del_value) (void *callback_data, const char *key_name, + const char *value_name); + WERROR (*del_key) (void *callback_data, const char *key_name); + WERROR (*del_all_values) (void *callback_data, const char *key_name); + WERROR (*done) (void *callback_data); +}; + +WERROR reg_diff_apply(struct registry_context *ctx, const char *filename); + +WERROR reg_generate_diff(struct registry_context *ctx1, + struct registry_context *ctx2, + const struct reg_diff_callbacks *callbacks, + void *callback_data); +WERROR reg_dotreg_diff_save(TALLOC_CTX *ctx, const char *filename, + struct smb_iconv_convenience *iconv_convenience, + struct reg_diff_callbacks **callbacks, + void **callback_data); +WERROR reg_generate_diff_key(struct registry_key *oldkey, + struct registry_key *newkey, + const char *path, + const struct reg_diff_callbacks *callbacks, + void *callback_data); + + #endif /* _REGISTRY_H */ |