summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-03-03 09:45:01 +0100
committerStefan Metzmacher <metze@samba.org>2010-03-05 14:09:01 +0100
commit0dfc77891509f056352748e3082794cb360200c7 (patch)
tree4de7b6c5004382f48187ee3d62e0d0768516b9ec
parent4c51c073806048c6ad65e2ea44877a144f560699 (diff)
downloadsamba-0dfc77891509f056352748e3082794cb360200c7.tar.gz
samba-0dfc77891509f056352748e3082794cb360200c7.tar.bz2
samba-0dfc77891509f056352748e3082794cb360200c7.zip
s4:libcli/wrepl: avoid neested named structures
metze
-rw-r--r--source4/libcli/wrepl/winsrepl.h34
1 files changed, 19 insertions, 15 deletions
diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h
index ec1fb6bb59..a69d3d83c3 100644
--- a/source4/libcli/wrepl/winsrepl.h
+++ b/source4/libcli/wrepl/winsrepl.h
@@ -129,6 +129,24 @@ struct wrepl_pull_table {
(type | (state << 2) | (node << 5) | \
(is_static ? WREPL_FLAGS_IS_STATIC : 0))
+struct wrepl_address {
+ const char *owner;
+ const char *address;
+};
+
+struct wrepl_name {
+ struct nbt_name name;
+ enum wrepl_name_type type;
+ enum wrepl_name_state state;
+ enum wrepl_name_node node;
+ bool is_static;
+ uint32_t raw_flags;
+ uint64_t version_id;
+ const char *owner;
+ uint32_t num_addresses;
+ struct wrepl_address *addresses;
+};
+
/*
a full pull replication
*/
@@ -139,21 +157,7 @@ struct wrepl_pull_names {
} in;
struct {
uint32_t num_names;
- struct wrepl_name {
- struct nbt_name name;
- enum wrepl_name_type type;
- enum wrepl_name_state state;
- enum wrepl_name_node node;
- bool is_static;
- uint32_t raw_flags;
- uint64_t version_id;
- const char *owner;
- uint32_t num_addresses;
- struct wrepl_address {
- const char *owner;
- const char *address;
- } *addresses;
- } *names;
+ struct wrepl_name *names;
} out;
};