diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 18:43:02 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 18:43:02 +0100 |
commit | 4590432d6290fd1c21a27ec5e6643d455e4fec69 (patch) | |
tree | 9852ce7955b5af67d0b474fdeece16ec579cbdcd /source4/wrepl_server | |
parent | e11c61bc5cd487dce06fc38bb0ee8c4e24b04e8c (diff) | |
download | samba-4590432d6290fd1c21a27ec5e6643d455e4fec69.tar.gz samba-4590432d6290fd1c21a27ec5e6643d455e4fec69.tar.bz2 samba-4590432d6290fd1c21a27ec5e6643d455e4fec69.zip |
Remove another global_loadparm instance.
(This used to be commit ccb29c0b463f5ccb53553f0a1c411ad77a84482a)
Diffstat (limited to 'source4/wrepl_server')
-rw-r--r-- | source4/wrepl_server/wrepl_out_helpers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/wrepl_server/wrepl_out_helpers.c b/source4/wrepl_server/wrepl_out_helpers.c index 72d55985bb..12605196ab 100644 --- a/source4/wrepl_server/wrepl_out_helpers.c +++ b/source4/wrepl_server/wrepl_out_helpers.c @@ -194,7 +194,7 @@ static struct composite_context *wreplsrv_out_connect_send(struct wreplsrv_partn state->wreplconn= wreplconn; state->c_req = wrepl_connect_send(wreplconn->sock, lp_resolve_context(service->task->lp_ctx), - partner->our_address, + partner->our_address?partner->our_address:wrepl_best_ip(service->task->lp_ctx, partner->address), partner->address); if (!state->c_req) goto failed; |