summaryrefslogtreecommitdiff
path: root/source4/wrepl_server
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-06 16:54:34 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:25 +0100
commit2f5ca872a80ad872ab864061f0c6982d8605393f (patch)
tree061592e4ae1e79adc57cd5d99ff2fd6f3b8c2549 /source4/wrepl_server
parentfb29325f1d4feba6c3f52b690d3da5d492618c4f (diff)
downloadsamba-2f5ca872a80ad872ab864061f0c6982d8605393f.tar.gz
samba-2f5ca872a80ad872ab864061f0c6982d8605393f.tar.bz2
samba-2f5ca872a80ad872ab864061f0c6982d8605393f.zip
r26313: Fix more uses of static loadparm.
(This used to be commit 6fd0d9d3b75546d08c24c513e05b1843d5777608)
Diffstat (limited to 'source4/wrepl_server')
-rw-r--r--source4/wrepl_server/wrepl_in_connection.c7
-rw-r--r--source4/wrepl_server/wrepl_server.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index 65c8b6118f..f5d1d82f9d 100644
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -286,7 +286,9 @@ NTSTATUS wreplsrv_setup_sockets(struct wreplsrv_service *service, struct loadpar
for(i = 0; i < num_interfaces; i++) {
address = iface_n_ip(i);
status = stream_setup_socket(task->event_ctx, model_ops, &wreplsrv_stream_ops,
- "ipv4", address, &port, service);
+ "ipv4", address, &port,
+ lp_socket_options(task->lp_ctx),
+ service);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("stream_setup_socket(address=%s,port=%u) failed - %s\n",
address, port, nt_errstr(status)));
@@ -296,7 +298,8 @@ NTSTATUS wreplsrv_setup_sockets(struct wreplsrv_service *service, struct loadpar
} else {
address = lp_socket_address(lp_ctx);
status = stream_setup_socket(task->event_ctx, model_ops, &wreplsrv_stream_ops,
- "ipv4", address, &port, service);
+ "ipv4", address, &port, lp_socket_options(task->lp_ctx),
+ service);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("stream_setup_socket(address=%s,port=%u) failed - %s\n",
address, port, nt_errstr(status)));
diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 7700a6ded7..7455c57d75 100644
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -74,7 +74,7 @@ failed:
static NTSTATUS wreplsrv_open_winsdb(struct wreplsrv_service *service,
struct loadparm_context *lp_ctx)
{
- service->wins_db = winsdb_connect(service, WINSDB_HANDLE_CALLER_WREPL);
+ service->wins_db = winsdb_connect(service, lp_ctx, WINSDB_HANDLE_CALLER_WREPL);
if (!service->wins_db) {
return NT_STATUS_INTERNAL_DB_ERROR;
}