From 63ef3c7fdc74e025c5547c391cf61a14ab68dd48 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 9 Sep 2005 16:00:02 +0000 Subject: r10113: rename libcli/wins to libcli/wrepl metze (This used to be commit d8b84112bb40605b07a77ab5f7a44ac1807ccc59) --- source4/libcli/wrepl/winsrepl.h | 114 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 source4/libcli/wrepl/winsrepl.h (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h new file mode 100644 index 0000000000..79b7f1fd70 --- /dev/null +++ b/source4/libcli/wrepl/winsrepl.h @@ -0,0 +1,114 @@ +/* + Unix SMB/CIFS implementation. + + structures for WINS replication client library + + Copyright (C) Andrew Tridgell 2005 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "librpc/gen_ndr/ndr_nbt.h" +#include "librpc/gen_ndr/ndr_winsrepl.h" + +/* + main context structure for the wins replication client library +*/ +struct wrepl_socket { + struct socket_context *sock; + struct event_context *event_ctx; + + /* a queue of requests pending to be sent */ + struct wrepl_request *send_queue; + + /* a queue of replies waiting to be received */ + struct wrepl_request *recv_queue; + + /* the fd event */ + struct fd_event *fde; +}; + +enum wrepl_request_state { + WREPL_REQUEST_SEND = 0, + WREPL_REQUEST_RECV = 1, + WREPL_REQUEST_DONE = 2, + WREPL_REQUEST_ERROR = 3 +}; + +/* + a WINS replication request +*/ +struct wrepl_request { + struct wrepl_request *next, *prev; + struct wrepl_socket *wrepl_socket; + + enum wrepl_request_state state; + NTSTATUS status; + + DATA_BLOB buffer; + + size_t num_read; + + struct wrepl_packet *packet; + + struct { + void (*fn)(struct wrepl_request *); + void *private; + } async; +}; + + +/* + setup an association +*/ +struct wrepl_associate { + struct { + uint32_t assoc_ctx; + } out; +}; + +/* + pull the partner table +*/ +struct wrepl_pull_table { + struct { + uint32_t assoc_ctx; + } in; + struct { + uint32_t num_partners; + struct wrepl_wins_owner *partners; + } out; +}; + +/* + a full pull replication +*/ +struct wrepl_pull_names { + struct { + uint32_t assoc_ctx; + struct wrepl_wins_owner partner; + } in; + struct { + uint32_t num_names; + struct wrepl_name { + struct nbt_name name; + uint32_t num_addresses; + struct wrepl_address { + const char *owner; + const char *address; + } *addresses; + } *names; + } out; +}; -- cgit From 4d024ddfb52504644313dfcb4ab0f97d07f83c29 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 27 Sep 2005 10:31:57 +0000 Subject: r10530: - fix some crash bugs when we lost the connection... metze (This used to be commit 0983452bf8b0922f6df7af4aa16b14835d39d036) --- source4/libcli/wrepl/winsrepl.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index 79b7f1fd70..a966cf5451 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -38,6 +38,9 @@ struct wrepl_socket { /* the fd event */ struct fd_event *fde; + + /* remember is the socket is dead */ + BOOL dead; }; enum wrepl_request_state { -- cgit From 0b2c6aec9217c40324dddcc2fef376f5a8c5c27d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 27 Sep 2005 16:53:08 +0000 Subject: r10547: - add wrepl_request timeout handling - when we got an unexpected READ event, we need to do a socket_recv() to find connection errors and we need to mark the socket as dead (and remove the fde_event) to prevent, endless loops on broken connections tridge: we should look carefull at other protocol, to handle broken connections without spinning metze (This used to be commit ff1272347739696dcdf2fd191b8f47ca82c205de) --- source4/libcli/wrepl/winsrepl.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index a966cf5451..64e09d61c6 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -39,6 +39,13 @@ struct wrepl_socket { /* the fd event */ struct fd_event *fde; + /* the default timeout for requests, 0 means no timeout */ +#define WREPL_SOCKET_REQUEST_TIMEOUT (60) + uint32_t request_timeout; + + /* counter for request timeouts, after 2 timeouts the socket is marked as dead */ + uint32_t timeout_count; + /* remember is the socket is dead */ BOOL dead; }; @@ -64,6 +71,8 @@ struct wrepl_request { size_t num_read; + struct timed_event *te; + struct wrepl_packet *packet; struct { -- cgit From f7c5e5a3987ea773203f6052e9cac34ae8992131 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 28 Sep 2005 09:58:58 +0000 Subject: r10569: add all info that we have to wrepl_name, as we need it for replication :-) metze (This used to be commit bfd548ca10134d5a17b87a0507917721aa251223) --- source4/libcli/wrepl/winsrepl.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index 64e09d61c6..2253fe181e 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -116,6 +116,10 @@ struct wrepl_pull_names { uint32_t num_names; struct wrepl_name { struct nbt_name name; + uint32_t flags; + uint32_t group_flag; + uint64_t version_id; + const char *owner; uint32_t num_addresses; struct wrepl_address { const char *owner; -- cgit From 08f16292a0cfab57c484661c1f05e1a49ec06942 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 29 Sep 2005 14:00:07 +0000 Subject: r10608: - fix hierachical memory handling in ndr_pull_nbt_name - add wrepl_nbt_name scalar type and do the pull/push in the ndr layer instead of the caller - give the flags and group_flag in the wrepl_name a meaning metze (This used to be commit b98efc2905e1147eb97111b46a877bdb9d8dd154) --- source4/libcli/wrepl/winsrepl.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index 2253fe181e..9b9362e4b3 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -104,6 +104,15 @@ struct wrepl_pull_table { } out; }; +#define WREPL_NAME_TYPE(flags) (flags & WREPL_FLAGS_RECORD_TYPE) +#define WREPL_NAME_STATE(flags) ((flags & WREPL_FLAGS_RECORD_STATE)>>2) +#define WREPL_NBT_NODE(flags) ((flags & WREPL_FLAGS_NODE_TYPE)<<8) +#define WREPL_NAME_IS_STATIC(flags) ((flags & WREPL_FLAGS_IS_STATIC)?True:False) + +#define WREPL_NAME_FLAGS(type, state, node, is_static) \ + (type | (state << 2) | (node>>8) | \ + (is_static ? WREPL_FLAGS_IS_STATIC : 0)) + /* a full pull replication */ @@ -116,8 +125,11 @@ struct wrepl_pull_names { uint32_t num_names; struct wrepl_name { struct nbt_name name; - uint32_t flags; - uint32_t group_flag; + enum wrepl_name_type type; + enum wrepl_name_state state; + enum nbt_node_type node; + BOOL is_static; + uint32_t raw_flags; uint64_t version_id; const char *owner; uint32_t num_addresses; -- cgit From c2d7914428f73d1826dffa893418fa286a5e9ab8 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 29 Sep 2005 22:06:24 +0000 Subject: r10627: - use a wrepl specific enum for the node type - the unknown flag 0x10 seems to mean that this name was localy registered on this currently asked server, that flag is not present in replica records metze (This used to be commit ba3685c41dc934692bd653f4fe9c0ee451146c40) --- source4/libcli/wrepl/winsrepl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index 9b9362e4b3..e78f0464e7 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -106,11 +106,11 @@ struct wrepl_pull_table { #define WREPL_NAME_TYPE(flags) (flags & WREPL_FLAGS_RECORD_TYPE) #define WREPL_NAME_STATE(flags) ((flags & WREPL_FLAGS_RECORD_STATE)>>2) -#define WREPL_NBT_NODE(flags) ((flags & WREPL_FLAGS_NODE_TYPE)<<8) +#define WREPL_NAME_NODE(flags) ((flags & WREPL_FLAGS_NODE_TYPE)>>5) #define WREPL_NAME_IS_STATIC(flags) ((flags & WREPL_FLAGS_IS_STATIC)?True:False) #define WREPL_NAME_FLAGS(type, state, node, is_static) \ - (type | (state << 2) | (node>>8) | \ + (type | (state << 2) | (node << 5) | \ (is_static ? WREPL_FLAGS_IS_STATIC : 0)) /* @@ -127,7 +127,7 @@ struct wrepl_pull_names { struct nbt_name name; enum wrepl_name_type type; enum wrepl_name_state state; - enum nbt_node_type node; + enum wrepl_name_node node; BOOL is_static; uint32_t raw_flags; uint64_t version_id; -- cgit From 6799fde75d1ccf93171874fd33f9e89e4472fd81 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 6 Oct 2005 14:38:07 +0000 Subject: r10766: - make it possible to mark a wrepl_request as send only, used for WREPL_REPL_INFORM* messsages - make it possible to close the connection after a request was send used for WREPL_ASSOCIATION_STOP - fix the torture test that tests the assoc context handling between connections, you can issue a request and get the reply on another connection, I think we should not implement that in our server code, as I think it's a security hole, you can cause a windows server to send the replies to someone another client, that doesn't wait for data, and as there're no massage_id in the protocol the client would be confused by a replies that doesn't belong to a query metze (This used to be commit dfc95de8fa7ded8ea92cafe58cf86efcc7920156) --- source4/libcli/wrepl/winsrepl.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index e78f0464e7..89a4c642b2 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -69,6 +69,10 @@ struct wrepl_request { DATA_BLOB buffer; + BOOL disconnect_after_send; + + BOOL send_only; + size_t num_read; struct timed_event *te; @@ -91,6 +95,16 @@ struct wrepl_associate { } out; }; +/* + setup an association +*/ +struct wrepl_associate_stop { + struct { + uint32_t assoc_ctx; + uint32_t reason; + } in; +}; + /* pull the partner table */ -- cgit From 36acd6e79c8cb881b9c333313402d993a6d0f511 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 12 Dec 2005 21:31:42 +0000 Subject: r12200: - move the the winsreplication client and server code to the packet_context system - this needs to be in one big patch, because of the merging code, that changes client in server connections and the other way around - use socket_connect_send/_recv() in the client code metze (This used to be commit f0105b7fcdc3032d22444a1973927fff2dd9a06f) --- source4/libcli/wrepl/winsrepl.h | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index 89a4c642b2..9bedfe7548 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -28,17 +28,16 @@ */ struct wrepl_socket { struct socket_context *sock; - struct event_context *event_ctx; + struct packet_context *packet; - /* a queue of requests pending to be sent */ - struct wrepl_request *send_queue; + struct { + struct event_context *ctx; + struct fd_event *fde; + } event; /* a queue of replies waiting to be received */ struct wrepl_request *recv_queue; - /* the fd event */ - struct fd_event *fde; - /* the default timeout for requests, 0 means no timeout */ #define WREPL_SOCKET_REQUEST_TIMEOUT (60) uint32_t request_timeout; @@ -50,8 +49,13 @@ struct wrepl_socket { BOOL dead; }; +struct wrepl_send_ctrl { + BOOL send_only; + BOOL disconnect_after_send; +}; + enum wrepl_request_state { - WREPL_REQUEST_SEND = 0, + WREPL_REQUEST_INIT = 0, WREPL_REQUEST_RECV = 1, WREPL_REQUEST_DONE = 2, WREPL_REQUEST_ERROR = 3 @@ -65,16 +69,9 @@ struct wrepl_request { struct wrepl_socket *wrepl_socket; enum wrepl_request_state state; + BOOL trigger; NTSTATUS status; - DATA_BLOB buffer; - - BOOL disconnect_after_send; - - BOOL send_only; - - size_t num_read; - struct timed_event *te; struct wrepl_packet *packet; -- cgit From c0c55a8168b5231c3b7667a82c41709949375402 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 14 Dec 2005 21:27:29 +0000 Subject: r12247: - reject freeing the wrepl_socket inside of wrepl_socket_dead() - free it at the end of wrepl_socket_dead() if needed metze (This used to be commit 58285115c83a3b7bbc9bf52a105cebd11831e9d8) --- source4/libcli/wrepl/winsrepl.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index 9bedfe7548..e679bef6e6 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -47,6 +47,9 @@ struct wrepl_socket { /* remember is the socket is dead */ BOOL dead; + + /* remember if we need to free the wrepl_socket at the end of wrepl_socket_dead() */ + BOOL free_skipped; }; struct wrepl_send_ctrl { -- cgit From 2cd5ca7d25f12aa9198bf8c2deb6aea282f573ee Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 28 Dec 2005 15:38:36 +0000 Subject: r12542: Move some more prototypes out to seperate headers (This used to be commit 0aca5fd5130d980d07398f3291d294202aefe3c2) --- source4/libcli/wrepl/winsrepl.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index e679bef6e6..2fea11bd63 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -154,3 +154,5 @@ struct wrepl_pull_names { } *names; } out; }; + +#include "libcli/wrepl/winsrepl_proto.h" -- cgit From 8528016978b084213ef53d66e1b6e831b1a01acc Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 16 Mar 2006 00:23:11 +0000 Subject: r14464: Don't include ndr_BASENAME.h files unless strictly required, instead try to include just the BASENAME.h files (containing only structs) (This used to be commit 3dd477ca5147f28a962b8437e2611a8222d706bd) --- source4/libcli/wrepl/winsrepl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index 2fea11bd63..3ea672327b 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -20,8 +20,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "librpc/gen_ndr/ndr_nbt.h" -#include "librpc/gen_ndr/ndr_winsrepl.h" +#include "librpc/gen_ndr/nbt.h" +#include "librpc/gen_ndr/winsrepl.h" /* main context structure for the wins replication client library -- cgit From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 02:07:03 +0000 Subject: r23792: convert Samba4 to GPLv3 There are still a few tidyups of old FSF addresses to come (in both s3 and s4). More commits soon. (This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa) --- source4/libcli/wrepl/winsrepl.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index 3ea672327b..b8473d1021 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -7,7 +7,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -16,8 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see . */ #include "librpc/gen_ndr/nbt.h" -- cgit From 61ffa08f4c95e29d301de9fbabd6e71c2dbc1056 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 27 Aug 2007 18:10:19 +0000 Subject: r24712: No longer expose the 'BOOL' data type in any interfaces. (This used to be commit 1ce32673d960c8b05b6c1b1b99e1976a402417ae) --- source4/libcli/wrepl/winsrepl.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index b8473d1021..3265024407 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -45,15 +45,15 @@ struct wrepl_socket { uint32_t timeout_count; /* remember is the socket is dead */ - BOOL dead; + bool dead; /* remember if we need to free the wrepl_socket at the end of wrepl_socket_dead() */ - BOOL free_skipped; + bool free_skipped; }; struct wrepl_send_ctrl { - BOOL send_only; - BOOL disconnect_after_send; + bool send_only; + bool disconnect_after_send; }; enum wrepl_request_state { @@ -71,7 +71,7 @@ struct wrepl_request { struct wrepl_socket *wrepl_socket; enum wrepl_request_state state; - BOOL trigger; + bool trigger; NTSTATUS status; struct timed_event *te; @@ -141,7 +141,7 @@ struct wrepl_pull_names { enum wrepl_name_type type; enum wrepl_name_state state; enum wrepl_name_node node; - BOOL is_static; + bool is_static; uint32_t raw_flags; uint64_t version_id; const char *owner; -- cgit From 2151cde58014ea2e822c13d2f8a369b45dc19ca8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 6 Oct 2007 22:28:14 +0000 Subject: r25554: Convert last instances of BOOL, True and False to the standard types. (This used to be commit 566aa14139510788548a874e9213d91317f83ca9) --- source4/libcli/wrepl/winsrepl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index 3265024407..8ce8b418a2 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -120,7 +120,7 @@ struct wrepl_pull_table { #define WREPL_NAME_TYPE(flags) (flags & WREPL_FLAGS_RECORD_TYPE) #define WREPL_NAME_STATE(flags) ((flags & WREPL_FLAGS_RECORD_STATE)>>2) #define WREPL_NAME_NODE(flags) ((flags & WREPL_FLAGS_NODE_TYPE)>>5) -#define WREPL_NAME_IS_STATIC(flags) ((flags & WREPL_FLAGS_IS_STATIC)?True:False) +#define WREPL_NAME_IS_STATIC(flags) ((flags & WREPL_FLAGS_IS_STATIC)?true:false) #define WREPL_NAME_FLAGS(type, state, node, is_static) \ (type | (state << 2) | (node << 5) | \ -- cgit From f055893ca571fbeac3675c02344c7cc53106bea1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 10 Dec 2007 18:41:55 +0100 Subject: r26382: Remove more uses of global_loadparm. (This used to be commit 6d4c59853481855c232e7cf97264a391f40af2b5) --- source4/libcli/wrepl/winsrepl.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index 8ce8b418a2..52b0bee69e 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -154,4 +154,6 @@ struct wrepl_pull_names { } out; }; +struct resolve_context; + #include "libcli/wrepl/winsrepl_proto.h" -- cgit From c38c2765d1059b33f044a42c6555f3d10d339911 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 21 Feb 2008 17:17:37 +0100 Subject: Remove yet more uses of global_loadparm. (This used to be commit e01c1e87c0fe9709df7eb5b863f7ce85564174cd) --- source4/libcli/wrepl/winsrepl.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/libcli/wrepl/winsrepl.h') diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index 52b0bee69e..f33e63119d 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -49,6 +49,8 @@ struct wrepl_socket { /* remember if we need to free the wrepl_socket at the end of wrepl_socket_dead() */ bool free_skipped; + + struct smb_iconv_convenience *iconv_convenience; }; struct wrepl_send_ctrl { -- cgit