summaryrefslogtreecommitdiff
path: root/source4/include
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-09-03 17:17:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:36:28 -0500
commit02b3abec25ed0b303906c5dae9dd527171762d9a (patch)
tree04bc902d7b1557e4038d34ccbced7e7ffab8109b /source4/include
parent0eea337a6f11c3a86414fbd31b065fc59a481435 (diff)
downloadsamba-02b3abec25ed0b303906c5dae9dd527171762d9a.tar.gz
samba-02b3abec25ed0b303906c5dae9dd527171762d9a.tar.bz2
samba-02b3abec25ed0b303906c5dae9dd527171762d9a.zip
r10007: Merge data_blk and data_len member of registry_value into a DATA_BLOB.
Fix handling of REG_DWORD in the LDB backend. Fix a couple of warnings (This used to be commit 709fdc7ebf5a77cfb50359fad978884777decc3b)
Diffstat (limited to 'source4/include')
-rw-r--r--source4/include/registry.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/source4/include/registry.h b/source4/include/registry.h
index e472ed6a87..dc17eb06b1 100644
--- a/source4/include/registry.h
+++ b/source4/include/registry.h
@@ -64,8 +64,7 @@ struct registry_key {
struct registry_value {
char *name;
unsigned int data_type;
- int data_len;
- void *data_blk; /* Might want a separate block */
+ DATA_BLOB data;
};
/* FIXME */
@@ -94,9 +93,8 @@ struct hive_operations {
/* Or this one */
WERROR (*open_key) (TALLOC_CTX *, struct registry_key *, const char *name, struct registry_key **);
- /* Either implement these */
- WERROR (*num_subkeys) (struct registry_key *, int *count);
- WERROR (*num_values) (struct registry_key *, int *count);
+ WERROR (*num_subkeys) (struct registry_key *, uint32_t *count);
+ WERROR (*num_values) (struct registry_key *, uint32_t *count);
WERROR (*get_subkey_by_index) (TALLOC_CTX *, struct registry_key *, int idx, struct registry_key **);
/* Can not contain more then one level */
@@ -120,7 +118,7 @@ struct hive_operations {
WERROR (*flush_key) (struct registry_key *);
/* Value management */
- WERROR (*set_value)(struct registry_key *, const char *name, uint32_t type, void *data, int len);
+ WERROR (*set_value)(struct registry_key *, const char *name, uint32_t type, DATA_BLOB data);
WERROR (*del_value)(struct registry_key *, const char *valname);
};
@@ -139,12 +137,8 @@ struct registry_context {
};
struct reg_init_function_entry {
- /* Function to create a member of the pdb_methods list */
const struct hive_operations *hive_functions;
struct reg_init_function_entry *prev, *next;
};
-/* Used internally */
-#define SMB_REG_ASSERT(a) { if(!(a)) { DEBUG(0,("%s failed! (%s:%d)", #a, __FILE__, __LINE__)); }}
-
#endif /* _REGISTRY_H */