diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-06 16:36:54 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:22 +0100 |
| commit | d378cf4c15e09b980f874bb103b28e89d9dd3a26 (patch) | |
| tree | 85c625bb49c1fdb0bb353b91817c0d32ad3ccb49 /source4/libcli | |
| parent | b84be078c197f9752b53d68c882f4d1b44979b8e (diff) | |
| download | samba-d378cf4c15e09b980f874bb103b28e89d9dd3a26.tar.gz samba-d378cf4c15e09b980f874bb103b28e89d9dd3a26.tar.bz2 samba-d378cf4c15e09b980f874bb103b28e89d9dd3a26.zip | |
r26310: Remove more uses of global_loadparm.
(This used to be commit 9d806da113b5f0688b6193dfdee9b8765e18b38f)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/dgram/libdgram.h | 2 | ||||
| -rw-r--r-- | source4/libcli/dgram/netlogon.c | 3 | ||||
| -rw-r--r-- | source4/libcli/dgram/ntlogon.c | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h index 9f67d58ae2..6d4cdb2bdf 100644 --- a/source4/libcli/dgram/libdgram.h +++ b/source4/libcli/dgram/libdgram.h @@ -123,6 +123,7 @@ NTSTATUS dgram_mailslot_netlogon_send(struct nbt_dgram_socket *dgmsock, struct nbt_netlogon_packet *request); NTSTATUS dgram_mailslot_netlogon_reply(struct nbt_dgram_socket *dgmsock, struct nbt_dgram_packet *request, + const char *my_netbios_name, const char *mailslot_name, struct nbt_netlogon_packet *reply); NTSTATUS dgram_mailslot_netlogon_parse(struct dgram_mailslot_handler *dgmslot, @@ -138,6 +139,7 @@ NTSTATUS dgram_mailslot_ntlogon_send(struct nbt_dgram_socket *dgmsock, struct nbt_ntlogon_packet *request); NTSTATUS dgram_mailslot_ntlogon_reply(struct nbt_dgram_socket *dgmsock, struct nbt_dgram_packet *request, + const char *my_netbios_name, const char *mailslot_name, struct nbt_ntlogon_packet *reply); NTSTATUS dgram_mailslot_ntlogon_parse(struct dgram_mailslot_handler *dgmslot, diff --git a/source4/libcli/dgram/netlogon.c b/source4/libcli/dgram/netlogon.c index f89c2c5644..92a66cddff 100644 --- a/source4/libcli/dgram/netlogon.c +++ b/source4/libcli/dgram/netlogon.c @@ -62,6 +62,7 @@ NTSTATUS dgram_mailslot_netlogon_send(struct nbt_dgram_socket *dgmsock, */ NTSTATUS dgram_mailslot_netlogon_reply(struct nbt_dgram_socket *dgmsock, struct nbt_dgram_packet *request, + const char *my_netbios_name, const char *mailslot_name, struct nbt_netlogon_packet *reply) { @@ -79,7 +80,7 @@ NTSTATUS dgram_mailslot_netlogon_reply(struct nbt_dgram_socket *dgmsock, return ndr_map_error2ntstatus(ndr_err); } - make_nbt_name_client(&myname, lp_netbios_name(global_loadparm)); + make_nbt_name_client(&myname, my_netbios_name); dest = socket_address_from_strings(tmp_ctx, dgmsock->sock->backend_name, request->src_addr, request->src_port); diff --git a/source4/libcli/dgram/ntlogon.c b/source4/libcli/dgram/ntlogon.c index b4b548fb27..8cd69176a5 100644 --- a/source4/libcli/dgram/ntlogon.c +++ b/source4/libcli/dgram/ntlogon.c @@ -63,6 +63,7 @@ NTSTATUS dgram_mailslot_ntlogon_send(struct nbt_dgram_socket *dgmsock, */ NTSTATUS dgram_mailslot_ntlogon_reply(struct nbt_dgram_socket *dgmsock, struct nbt_dgram_packet *request, + const char *my_netbios_name, const char *mailslot_name, struct nbt_ntlogon_packet *reply) { @@ -80,7 +81,7 @@ NTSTATUS dgram_mailslot_ntlogon_reply(struct nbt_dgram_socket *dgmsock, return ndr_map_error2ntstatus(ndr_err); } - make_nbt_name_client(&myname, lp_netbios_name(global_loadparm)); + make_nbt_name_client(&myname, my_netbios_name); dest = socket_address_from_strings(tmp_ctx, dgmsock->sock->backend_name, |