diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-07 15:35:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:05:28 -0500 |
| commit | 959915a8cbea0c598ef1f29ce666329a521ef2f6 (patch) | |
| tree | 68e1b2b483f60be3839dc476ab0ca0fb4dd0ec0b /source4/libcli | |
| parent | cd962355abad90a2161765a7be7d26e63572cab7 (diff) | |
| download | samba-959915a8cbea0c598ef1f29ce666329a521ef2f6.tar.gz samba-959915a8cbea0c598ef1f29ce666329a521ef2f6.tar.xz samba-959915a8cbea0c598ef1f29ce666329a521ef2f6.zip | |
r25001: Fix more C++ and other warnings, fix some of the indentation with ts=4 lines that I accidently added earlier.
(This used to be commit 0bcb21ed740fcec0f48ad36bbc2deee2948e8fc7)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/nbt/namerefresh.c | 3 | ||||
| -rw-r--r-- | source4/libcli/raw/raweas.c | 1 | ||||
| -rw-r--r-- | source4/libcli/raw/rawlpq.c | 1 | ||||
| -rw-r--r-- | source4/libcli/raw/smb_signing.c | 2 | ||||
| -rw-r--r-- | source4/libcli/resolve/resolve.c | 3 | ||||
| -rw-r--r-- | source4/libcli/resolve/wins.c | 7 |
6 files changed, 11 insertions, 6 deletions
diff --git a/source4/libcli/nbt/namerefresh.c b/source4/libcli/nbt/namerefresh.c index a60e54ed6a..afa80d68f8 100644 --- a/source4/libcli/nbt/namerefresh.c +++ b/source4/libcli/nbt/namerefresh.c @@ -66,7 +66,8 @@ struct nbt_name_request *nbt_name_refresh_send(struct nbt_name_socket *nbtsock, packet->additional[0].rdata.netbios.addresses[0].ipaddr = talloc_strdup(packet->additional, io->in.address); - dest = socket_address_from_strings(nbtsock, nbtsock->sock->backend_name, + dest = socket_address_from_strings(nbtsock, + nbtsock->sock->backend_name, io->in.dest_addr, lp_nbt_port()); if (dest == NULL) goto failed; req = nbt_name_request_send(nbtsock, dest, packet, diff --git a/source4/libcli/raw/raweas.c b/source4/libcli/raw/raweas.c index f79de88fa6..06b5b4fc4d 100644 --- a/source4/libcli/raw/raweas.c +++ b/source4/libcli/raw/raweas.c @@ -19,6 +19,7 @@ #include "includes.h" #include "smb.h" +#include "libcli/raw/libcliraw.h" /* work out how many bytes on the wire a ea list will consume. diff --git a/source4/libcli/raw/rawlpq.c b/source4/libcli/raw/rawlpq.c index 03f7a82f1c..46e0efaaf5 100644 --- a/source4/libcli/raw/rawlpq.c +++ b/source4/libcli/raw/rawlpq.c @@ -19,6 +19,7 @@ #include "includes.h" #include "smb.h" +#include "libcli/raw/libcliraw.h" /**************************************************************************** lpq - async send diff --git a/source4/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c index 99044d23ae..a37c9a7836 100644 --- a/source4/libcli/raw/smb_signing.c +++ b/source4/libcli/raw/smb_signing.c @@ -375,7 +375,7 @@ BOOL smbcli_transport_simple_set_signing(struct smbcli_transport *transport, } -BOOL smbcli_init_signing(struct smbcli_transport *transport) +bool smbcli_init_signing(struct smbcli_transport *transport) { transport->negotiate.sign_info.mac_key = data_blob(NULL, 0); if (!smbcli_set_signing_off(&transport->negotiate.sign_info)) { diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c index 63598fdd00..ee9b8df148 100644 --- a/source4/libcli/resolve/resolve.c +++ b/source4/libcli/resolve/resolve.c @@ -188,7 +188,8 @@ NTSTATUS resolve_name_recv(struct composite_context *c, NTSTATUS resolve_name(struct nbt_name *name, TALLOC_CTX *mem_ctx, const char **reply_addr, struct event_context *ev) { - struct composite_context *c = resolve_name_send(name, ev, lp_name_resolve_order()); + struct composite_context *c = resolve_name_send(name, ev, + lp_name_resolve_order()); return resolve_name_recv(c, mem_ctx, reply_addr); } diff --git a/source4/libcli/resolve/wins.c b/source4/libcli/resolve/wins.c index 7af12075a1..f7bfdc3405 100644 --- a/source4/libcli/resolve/wins.c +++ b/source4/libcli/resolve/wins.c @@ -26,9 +26,10 @@ /* wins name resolution method - async send */ -struct composite_context *resolve_name_wins_send(TALLOC_CTX *mem_ctx, - struct event_context *event_ctx, - struct nbt_name *name) +struct composite_context *resolve_name_wins_send( + TALLOC_CTX *mem_ctx, + struct event_context *event_ctx, + struct nbt_name *name) { const char **address_list = lp_wins_server_list(); if (address_list == NULL) return NULL; |