The branch, master has been updated
via d3c678233c4 s3:smbd: Covscan: remove dead code
via 26288594905 s3:smbd Fix trailing whitespace in files.c
via 9da9b516d4a s3:libsmb: Covscan: unchecked return value for
cli_credentials_set_smb_encryption()
via 3960af99e58 auth: Covscan: unchecked return value for
cli_credentials_set_smb_encryption()
via ccda9c162c8 auth: Fix trailing whitespace in pycredentials.c
via 8cb65650117 ctdb: Covscan: unchecked return value for
trbt_traversearray32()
via 91d1d0e4c89 ctdb: Fix trailing whitespace in rb_tree.c
via 6127509986b s4:libcli: Covscan: unchecked return value for
file_save()
via 238d3603be5 s4:libcli: Fix trailing whitespace in browse.c
via 9cfed3f3cd1 s4:libcli: Covscan: unchecked return value for
file_save()
via 679942eafde s4:libcli: Fix trailing whitespace in netlogon.c
via d4e5712cafe libcli: Covscan: unchecked return value for file_save()
via 6781ab1172c libcli: Fix trailing whitespace in netlogon.c
from 8231eaf856b gpo: Cert Auto Enroll use ldap trust cert if NDES
disabled
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d3c678233c41e21d8c65f4ea0108a2046451367c
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 14:20:34 2022 +0200
s3:smbd: Covscan: remove dead code
Covscan:
source3/smbd/files.c:575: check_after_deref: Null-checking "fsp" suggests
that it
may be null, but it has already been dereferenced on all paths leading to
the check.
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Sat May 14 04:41:57 UTC 2022 on sn-devel-184
commit 2628859490510824d24a67a4f677a663254fee85
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 14:19:44 2022 +0200
s3:smbd Fix trailing whitespace in files.c
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit 9da9b516d4acb1e76fb2a6233a6ba35d8496ad5f
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 10:14:53 2022 +0200
s3:libsmb: Covscan: unchecked return value for
cli_credentials_set_smb_encryption()
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit 3960af99e58f3f107f874489b3ab1294eb285cd6
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 12:11:21 2022 +0200
auth: Covscan: unchecked return value for
cli_credentials_set_smb_encryption()
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit ccda9c162c841a86e88999dc366a6c862b1cb4ac
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 12:10:36 2022 +0200
auth: Fix trailing whitespace in pycredentials.c
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit 8cb65650117569dadf5c764f72e5cfb292efb5a4
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 12:06:22 2022 +0200
ctdb: Covscan: unchecked return value for trbt_traversearray32()
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit 91d1d0e4c8935878d43b9436d89bddfecfe2bd0a
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 12:04:34 2022 +0200
ctdb: Fix trailing whitespace in rb_tree.c
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit 6127509986b10a635ba623bc54f3d01d35de9b2e
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 11:39:28 2022 +0200
s4:libcli: Covscan: unchecked return value for file_save()
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit 238d3603be519f1fd99b21701540e27e0f219f01
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 11:38:45 2022 +0200
s4:libcli: Fix trailing whitespace in browse.c
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit 9cfed3f3cd14b9c25150da73714fc8ee0215e8ae
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 11:36:48 2022 +0200
s4:libcli: Covscan: unchecked return value for file_save()
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit 679942eafde4589309e8f4e90095ce38b0bc08e5
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 11:36:03 2022 +0200
s4:libcli: Fix trailing whitespace in netlogon.c
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit d4e5712cafe849840f0b57c4b11774d4452e7561
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 11:32:47 2022 +0200
libcli: Covscan: unchecked return value for file_save()
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit 6781ab1172c3baa6c567483f258ac1af1f2dadf7
Author: Pavel Filipenský <pfili...@redhat.com>
Date: Wed May 11 11:31:52 2022 +0200
libcli: Fix trailing whitespace in netlogon.c
Signed-off-by: Pavel Filipenský <pfili...@redhat.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
auth/credentials/pycredentials.c | 10 +++---
ctdb/common/rb_tree.c | 68 ++++++++++++++++++++--------------------
ctdb/server/ipalloc.c | 7 ++++-
libcli/netlogon/netlogon.c | 8 ++---
source3/libsmb/libsmb_server.c | 21 +++++++------
source3/smbd/files.c | 5 +--
source4/libcli/dgram/browse.c | 18 +++++------
source4/libcli/dgram/netlogon.c | 28 ++++++++---------
8 files changed, 85 insertions(+), 80 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/credentials/pycredentials.c b/auth/credentials/pycredentials.c
index 49ea06bcd69..b779f274b89 100644
--- a/auth/credentials/pycredentials.c
+++ b/auth/credentials/pycredentials.c
@@ -1,17 +1,17 @@
-/*
+/*
Unix SMB/CIFS implementation.
Copyright (C) Jelmer Vernooij <jel...@samba.org> 2007
-
+
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 3 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, see <http://www.gnu.org/licenses/>.
*/
@@ -1136,7 +1136,7 @@ static PyObject *py_creds_set_smb_encryption(PyObject
*self, PyObject *args)
return NULL;
}
- cli_credentials_set_smb_encryption(creds, encryption_state, obt);
+ (void)cli_credentials_set_smb_encryption(creds, encryption_state, obt);
Py_RETURN_NONE;
}
diff --git a/ctdb/common/rb_tree.c b/ctdb/common/rb_tree.c
index d94d15efd74..0965623be77 100644
--- a/ctdb/common/rb_tree.c
+++ b/ctdb/common/rb_tree.c
@@ -1,4 +1,4 @@
-/*
+/*
a talloc based red-black tree
Copyright (C) Ronnie Sahlberg 2007
@@ -7,12 +7,12 @@
it under the terms of the GNU General Public License as published by
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,
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, see <http://www.gnu.org/licenses/>.
*/
@@ -32,7 +32,7 @@
}} while (0)
-static void
+static void
tree_destructor_traverse_node(TALLOC_CTX *mem_ctx, trbt_node_t *node)
{
talloc_set_destructor(node, NULL);
@@ -89,7 +89,7 @@ trbt_create(TALLOC_CTX *memctx, uint32_t flags)
/* If the tree is freed, we must walk over all entries and steal the
node from the stored data pointer and release the node.
- Note, when we free the tree we only free the tree and not any of
+ Note, when we free the tree we only free the tree and not any of
the data stored in the tree.
*/
talloc_set_destructor(tree, tree_destructor);
@@ -373,7 +373,7 @@ trbt_delete_case5(trbt_node_t *node)
trbt_rotate_right(sibling);
trbt_delete_case6(node);
return;
- }
+ }
if ( (node == parent->right)
&&(trbt_get_color(sibling) == TRBT_BLACK)
&&(trbt_get_color_right(sibling) == TRBT_RED)
@@ -423,7 +423,7 @@ trbt_delete_case3(trbt_node_t *node)
trbt_delete_case4(node);
}
}
-
+
static inline void
trbt_delete_case2(trbt_node_t *node)
{
@@ -440,7 +440,7 @@ trbt_delete_case2(trbt_node_t *node)
}
}
trbt_delete_case3(node);
-}
+}
static void
trbt_delete_case1(trbt_node_t *node)
@@ -459,7 +459,7 @@ delete_node(trbt_node_t *node, bool from_destructor)
trbt_node_t *temp = NULL;
/* This node has two child nodes, then just copy the content
- from the next smaller node with this node and delete the
+ from the next smaller node with this node and delete the
predecessor instead.
The predecessor is guaranteed to have at most one child
node since its right arm must be NULL
@@ -482,11 +482,11 @@ delete_node(trbt_node_t *node, bool from_destructor)
node->data = temp->data;
/* now we let node hang off the new data */
talloc_steal(node->data, node);
-
+
temp->data = NULL;
temp->key32 = -1;
/* then delete the temp node.
- this node is guaranteed to have at least one leaf
+ this node is guaranteed to have at least one leaf
child */
delete_node(temp, from_destructor);
goto finished;
@@ -538,11 +538,11 @@ delete_node(trbt_node_t *node, bool from_destructor)
}
}
- /* If we had to create a temporary dummy node to represent a black
+ /* If we had to create a temporary dummy node to represent a black
leaf child we now has to delete it.
This is simple since this dummy node originally had no children
- and we are guaranteed that it will also not have any children
- after the node has been deleted and any possible rotations
+ and we are guaranteed that it will also not have any children
+ after the node has been deleted and any possible rotations
have occurred.
The only special case is if this was the last node of the tree
@@ -642,8 +642,8 @@ trbt_create_node(trbt_tree_t *tree, trbt_node_t *parent,
uint32_t key, void *dat
return node;
}
-/* insert a new node in the tree.
- if there is already a node with a matching key in the tree
+/* insert a new node in the tree.
+ if there is already a node with a matching key in the tree
we replace it with the new data and return a pointer to the old data
in case the caller wants to take any special action
*/
@@ -666,7 +666,7 @@ trbt_insert32(trbt_tree_t *tree, uint32_t key, void *data)
* insert this new leaf.
*/
while(1){
- /* this node already exists, replace data and return the
+ /* this node already exists, replace data and return the
old data
*/
if(key==node->key32){
@@ -743,7 +743,7 @@ trbt_lookup32(trbt_tree_t *tree, uint32_t key)
/* This deletes a node from the tree.
Note that this does not release the data that the node points to
*/
-void
+void
trbt_delete32(trbt_tree_t *tree, uint32_t key)
{
trbt_node_t *node;
@@ -767,7 +767,7 @@ trbt_delete32(trbt_tree_t *tree, uint32_t key)
}
-void
+void
trbt_insert32_callback(trbt_tree_t *tree, uint32_t key, void *(*callback)(void
*param, void *data), void *param)
{
trbt_node_t *node;
@@ -776,7 +776,7 @@ trbt_insert32_callback(trbt_tree_t *tree, uint32_t key,
void *(*callback)(void *
/* is this the first node ?*/
if(!node){
- node = trbt_create_node(tree, NULL, key,
+ node = trbt_create_node(tree, NULL, key,
callback(param, NULL));
tree->root=node;
@@ -787,11 +787,11 @@ trbt_insert32_callback(trbt_tree_t *tree, uint32_t key,
void *(*callback)(void *
* insert this new leaf.
*/
while(1){
- /* this node already exists, replace it
+ /* this node already exists, replace it
*/
if(key==node->key32){
node->data = callback(param, node->data);
- talloc_steal(node->data, node);
+ talloc_steal(node->data, node);
return;
}
@@ -846,7 +846,7 @@ static void *array_insert_callback(void *p, void *data)
trbt_tree_t *tree = NULL;
- /* if keylen has reached 0 we are done and can call the users
+ /* if keylen has reached 0 we are done and can call the users
callback function with the users parameters
*/
if (param->keylen == 0) {
@@ -868,7 +868,7 @@ static void *array_insert_callback(void *p, void *data)
/* we already have a subtree for this path */
tree = (trbt_tree_t *)data;
}
-
+
trbt_insertarray32_callback(tree, param->keylen, param->key,
param->callback, param->param);
/* now return either the old tree we got in *data or the new tree
@@ -881,7 +881,7 @@ static void *array_insert_callback(void *p, void *data)
/* insert into the tree using an array of uint32 as a key */
-void
+void
trbt_insertarray32_callback(trbt_tree_t *tree, uint32_t keylen, uint32_t *key,
void *(*cb)(void *param, void *data), void *pm)
{
struct trbt_array_param tap;
@@ -903,7 +903,7 @@ void *
trbt_lookuparray32(trbt_tree_t *tree, uint32_t keylen, uint32_t *key)
{
/* if keylen is 1 we can do a regular lookup and return this to the
- user
+ user
*/
if (keylen == 1) {
return trbt_lookup32(tree, key[0]);
@@ -923,8 +923,8 @@ trbt_lookuparray32(trbt_tree_t *tree, uint32_t keylen,
uint32_t *key)
/* traverse a tree starting at node */
static int
-trbt_traversearray32_node(trbt_node_t *node, uint32_t keylen,
- int (*callback)(void *param, void *data),
+trbt_traversearray32_node(trbt_node_t *node, uint32_t keylen,
+ int (*callback)(void *param, void *data),
void *param)
{
trbt_node_t *left = node->left;
@@ -969,12 +969,12 @@ trbt_traversearray32_node(trbt_node_t *node, uint32_t
keylen,
return 0;
}
-
+
/* traverse the tree using an array of uint32 as a key */
-int
-trbt_traversearray32(trbt_tree_t *tree, uint32_t keylen,
- int (*callback)(void *param, void *data),
+int
+trbt_traversearray32(trbt_tree_t *tree, uint32_t keylen,
+ int (*callback)(void *param, void *data),
void *param)
{
trbt_node_t *node;
@@ -1003,7 +1003,7 @@ trbt_findfirstarray32(trbt_tree_t *tree, uint32_t keylen)
if (keylen < 1) {
return NULL;
}
-
+
if (tree == NULL) {
return NULL;
}
@@ -1056,7 +1056,7 @@ void print_tree(trbt_tree_t *tree)
printf("===\n");
}
-void
+void
test_tree(void)
{
trbt_tree_t *tree;
diff --git a/ctdb/server/ipalloc.c b/ctdb/server/ipalloc.c
index bacbdb32aee..7f4936439da 100644
--- a/ctdb/server/ipalloc.c
+++ b/ctdb/server/ipalloc.c
@@ -96,6 +96,7 @@ create_merged_ip_list(struct ipalloc_state *ipalloc_state)
struct public_ip_list *ip_list;
struct ctdb_public_ip_list *public_ips;
struct trbt_tree *ip_tree;
+ int ret;
ip_tree = trbt_create(ipalloc_state, 0);
@@ -138,7 +139,11 @@ create_merged_ip_list(struct ipalloc_state *ipalloc_state)
}
ip_list = NULL;
- trbt_traversearray32(ip_tree, IP_KEYLEN, getips_count_callback,
&ip_list);
+ ret = trbt_traversearray32(ip_tree, IP_KEYLEN, getips_count_callback,
&ip_list);
+ if (ret != 0) {
+ DBG_ERR("Error traversing the IP tree.\n");
+ }
+
talloc_free(ip_tree);
return ip_list;
diff --git a/libcli/netlogon/netlogon.c b/libcli/netlogon/netlogon.c
index 59af460dc4e..15e808743d1 100644
--- a/libcli/netlogon/netlogon.c
+++ b/libcli/netlogon/netlogon.c
@@ -192,7 +192,7 @@ NTSTATUS push_nbt_netlogon_response(DATA_BLOB *data,
TALLOC_CTX *mem_ctx,
DEBUG(0,("Failed to parse netlogon packet of length %d:
%s\n",
(int)data->length, nt_errstr(status)));
if (DEBUGLVL(10)) {
- file_save("netlogon.dat", data->data,
data->length);
+ (void)file_save("netlogon.dat", data->data,
data->length);
}
return status;
}
@@ -200,7 +200,7 @@ NTSTATUS push_nbt_netlogon_response(DATA_BLOB *data,
TALLOC_CTX *mem_ctx,
break;
case NETLOGON_SAMLOGON:
status = push_netlogon_samlogon_response(
- data, mem_ctx,
+ data, mem_ctx,
&response->data.samlogon);
break;
case NETLOGON_RESPONSE2:
@@ -243,7 +243,7 @@ NTSTATUS pull_nbt_netlogon_response(DATA_BLOB *data,
TALLOC_CTX *mem_ctx,
DEBUG(0,("Failed to parse netlogon packet of length %d:
%s\n",
(int)data->length, nt_errstr(status)));
if (DEBUGLVL(10)) {
- file_save("netlogon.dat", data->data,
data->length);
+ (void)file_save("netlogon.dat", data->data,
data->length);
}
return status;
}
@@ -266,7 +266,7 @@ NTSTATUS pull_nbt_netlogon_response(DATA_BLOB *data,
TALLOC_CTX *mem_ctx,
case LOGON_SAM_LOGON_PAUSE_RESPONSE_EX:
case LOGON_SAM_LOGON_USER_UNKNOWN_EX:
status = pull_netlogon_samlogon_response(
- data, mem_ctx,
+ data, mem_ctx,
&response->data.samlogon);
response->response_type = NETLOGON_SAMLOGON;
break;
diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index ce17e4fed09..175e0b2462b 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -308,20 +308,23 @@ static struct cli_credentials
*SMBC_auth_credentials(TALLOC_CTX *mem_ctx,
/* Use the config option */
break;
case SMBC_ENCRYPTLEVEL_NONE:
- cli_credentials_set_smb_encryption(creds,
- SMB_ENCRYPTION_OFF,
- CRED_SPECIFIED);
+ (void)cli_credentials_set_smb_encryption(
+ creds,
+ SMB_ENCRYPTION_OFF,
+ CRED_SPECIFIED);
break;
case SMBC_ENCRYPTLEVEL_REQUEST:
- cli_credentials_set_smb_encryption(creds,
- SMB_ENCRYPTION_DESIRED,
- CRED_SPECIFIED);
+ (void)cli_credentials_set_smb_encryption(
+ creds,
+ SMB_ENCRYPTION_DESIRED,
+ CRED_SPECIFIED);
break;
case SMBC_ENCRYPTLEVEL_REQUIRE:
default:
- cli_credentials_set_smb_encryption(creds,
- SMB_ENCRYPTION_REQUIRED,
- CRED_SPECIFIED);
+ (void)cli_credentials_set_smb_encryption(
+ creds,
+ SMB_ENCRYPTION_REQUIRED,
+ CRED_SPECIFIED);
break;
}
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 9d31446d0c5..7a41cff5654 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -1,4 +1,4 @@
-/*
+/*
Unix SMB/CIFS implementation.
Files[] structure handling
Copyright (C) Andrew Tridgell 1998
@@ -598,9 +598,6 @@ fail:
smb_fname_str_dbg(smb_fname),
nt_errstr(status));
- if (fsp == NULL) {
- return status;
- }
if (fsp_is_alternate_stream(fsp)) {
struct files_struct *tmp_base_fsp = fsp->base_fsp;
diff --git a/source4/libcli/dgram/browse.c b/source4/libcli/dgram/browse.c
index ab831df8ccb..437b6e13e86 100644
--- a/source4/libcli/dgram/browse.c
+++ b/source4/libcli/dgram/browse.c
@@ -1,21 +1,21 @@
-/*
+/*
Unix SMB/CIFS implementation.
handling for browsing dgram requests
Copyright (C) Jelmer Vernooij 2005
Heavily based on ntlogon.c
-
+
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 3 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, see <http://www.gnu.org/licenses/>.
*/
@@ -45,9 +45,9 @@ NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket
*dgmsock,
return ndr_map_error2ntstatus(ndr_err);
}
- status = dgram_mailslot_send(dgmsock, DGRAM_DIRECT_UNIQUE,
+ status = dgram_mailslot_send(dgmsock, DGRAM_DIRECT_UNIQUE,
NBT_MAILSLOT_BROWSE,
- dest_name, dest,
+ dest_name, dest,
src_name, &blob);
talloc_free(tmp_ctx);
return status;
@@ -75,14 +75,14 @@ NTSTATUS dgram_mailslot_browse_reply(struct
nbt_dgram_socket *dgmsock,
make_nbt_name_client(&myname, my_netbios_name);
- dest = socket_address_from_strings(tmp_ctx,
dgmsock->sock->backend_name,
+ dest = socket_address_from_strings(tmp_ctx, dgmsock->sock->backend_name,
request->src_addr,
request->src_port);
if (!dest) {
talloc_free(tmp_ctx);
return NT_STATUS_NO_MEMORY;
}
- status = dgram_mailslot_send(dgmsock, DGRAM_DIRECT_UNIQUE,
+ status = dgram_mailslot_send(dgmsock, DGRAM_DIRECT_UNIQUE,
mailslot_name,
&request->data.msg.source_name,
dest,
@@ -106,7 +106,7 @@ NTSTATUS dgram_mailslot_browse_parse(struct
dgram_mailslot_handler *dgmslot,
DEBUG(0,("Failed to parse browse packet of length %d: %s\n",
(int)data.length, nt_errstr(status)));
if (DEBUGLVL(10)) {
- file_save("browse.dat", data.data, data.length);
+ (void)file_save("browse.dat", data.data, data.length);
}
return status;
}
diff --git a/source4/libcli/dgram/netlogon.c b/source4/libcli/dgram/netlogon.c
index 25612acc6d0..1124a3318ba 100644
--- a/source4/libcli/dgram/netlogon.c
+++ b/source4/libcli/dgram/netlogon.c
@@ -1,20 +1,20 @@
-/*
+/*
Unix SMB/CIFS implementation.
handling for netlogon dgram requests
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 3 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.
--
Samba Shared Repository
