The branch, master has been updated
via c42c0c0 torture: Remove a use of get_my_vnn()
via c4504bd lib: Fix some whitespace
via 8c332f4 lib: Fix a signed/unsigned mixup
via 7d0fe14 ctdb: Fix the O3 developer build
via 2600f82 ctdb: Improve debug in case of set_runstate failure
via a5d49b7 smbd: Fix an assert
from ecbe6c6 ctdb-scripts: Add GlusterFS support to nfs-ganesha-callout
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c42c0c071f3ac6067ff9c53fade2e900342d56ae
Author: Volker Lendecke <v...@samba.org>
Date: Wed Oct 14 11:52:24 2015 +0200
torture: Remove a use of get_my_vnn()
Reduce the use of globals
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Mon May 16 23:23:53 CEST 2016 on sn-devel-144
commit c4504bd7e344773f5d1b8cb16c398e43de3d2390
Author: Volker Lendecke <v...@samba.org>
Date: Sun May 1 17:30:11 2016 +0200
lib: Fix some whitespace
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 8c332f46e4efc93e2b3aa810eff6b4e5778bb156
Author: Volker Lendecke <v...@samba.org>
Date: Sun May 1 17:28:56 2016 +0200
lib: Fix a signed/unsigned mixup
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 7d0fe145e23c3f58ef311d6749dc0ea0285fe890
Author: Volker Lendecke <v...@samba.org>
Date: Mon May 16 16:42:18 2016 +0200
ctdb: Fix the O3 developer build
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 2600f823deb795c45ca484d0e6808c5af7ab9548
Author: Volker Lendecke <v...@samba.org>
Date: Sun Apr 24 16:07:43 2016 +0200
ctdb: Improve debug in case of set_runstate failure
If this fails, we want to know which states it wanted to move to. Don't do
the
return before the debug.
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit a5d49b7ce1cfbf8491bc3d29c1ae5b0960b5fe01
Author: Volker Lendecke <v...@samba.org>
Date: Wed Apr 20 13:13:38 2016 +0200
smbd: Fix an assert
This might stumble over stale entries
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11844
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
ctdb/common/ctdb_util.c | 5 +++--
ctdb/tests/src/fake_ctdbd.c | 6 ++++--
lib/crypto/arcfour.c | 27 ++++++++++++++-------------
source3/smbd/oplock.c | 1 +
source3/torture/msg_source.c | 5 +++--
5 files changed, 25 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c
index 39108bc..154878b 100644
--- a/ctdb/common/ctdb_util.c
+++ b/ctdb/common/ctdb_util.c
@@ -642,12 +642,13 @@ enum ctdb_runstate runstate_from_string(const char *label)
void ctdb_set_runstate(struct ctdb_context *ctdb, enum ctdb_runstate runstate)
{
+ DEBUG(DEBUG_NOTICE,("Set runstate to %s (%d)\n",
+ runstate_to_string(runstate), runstate));
+
if (runstate <= ctdb->runstate) {
ctdb_fatal(ctdb, "runstate must always increase");
}
- DEBUG(DEBUG_NOTICE,("Set runstate to %s (%d)\n",
- runstate_to_string(runstate), runstate));
ctdb->runstate = runstate;
}
diff --git a/ctdb/tests/src/fake_ctdbd.c b/ctdb/tests/src/fake_ctdbd.c
index e198a5d..0d08313 100644
--- a/ctdb/tests/src/fake_ctdbd.c
+++ b/ctdb/tests/src/fake_ctdbd.c
@@ -2025,7 +2025,8 @@ static void server_new_client(struct tevent_req *subreq)
struct server_state *state = tevent_req_data(
req, struct server_state);
struct ctdbd_context *ctdb = state->ctdb;
- int client_fd, ret;
+ int client_fd;
+ int ret = 0;
client_fd = accept_recv(subreq, &ret);
TALLOC_FREE(subreq);
@@ -2057,7 +2058,8 @@ static void server_client_done(struct tevent_req *subreq)
struct server_state *state = tevent_req_data(
req, struct server_state);
struct ctdbd_context *ctdb = state->ctdb;
- int ret, status;
+ int ret = 0;
+ int status;
status = client_recv(subreq, &ret);
TALLOC_FREE(subreq);
diff --git a/lib/crypto/arcfour.c b/lib/crypto/arcfour.c
index d310649..af9b20c 100644
--- a/lib/crypto/arcfour.c
+++ b/lib/crypto/arcfour.c
@@ -1,20 +1,20 @@
-/*
+/*
Unix SMB/CIFS implementation.
An implementation of the arcfour algorithm
Copyright (C) Andrew Tridgell 1998
-
+
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/>.
*/
@@ -23,19 +23,19 @@
#include "../lib/crypto/arcfour.h"
/* initialise the arcfour sbox with key */
-_PUBLIC_ void arcfour_init(struct arcfour_state *state, const DATA_BLOB *key)
+_PUBLIC_ void arcfour_init(struct arcfour_state *state, const DATA_BLOB *key)
{
- int ind;
+ size_t ind;
uint8_t j = 0;
for (ind = 0; ind < sizeof(state->sbox); ind++) {
state->sbox[ind] = (uint8_t)ind;
}
-
+
for (ind = 0; ind < sizeof(state->sbox); ind++) {
uint8_t tc;
-
+
j += (state->sbox[ind] + key->data[ind%key->length]);
-
+
tc = state->sbox[ind];
state->sbox[ind] = state->sbox[j];
state->sbox[j] = tc;
@@ -45,10 +45,11 @@ _PUBLIC_ void arcfour_init(struct arcfour_state *state,
const DATA_BLOB *key)
}
/* crypt the data with arcfour */
-_PUBLIC_ void arcfour_crypt_sbox(struct arcfour_state *state, uint8_t *data,
int len)
+_PUBLIC_ void arcfour_crypt_sbox(struct arcfour_state *state, uint8_t *data,
+ int len)
{
int ind;
-
+
for (ind = 0; ind < len; ind++) {
uint8_t tc;
uint8_t t;
@@ -59,7 +60,7 @@ _PUBLIC_ void arcfour_crypt_sbox(struct arcfour_state *state,
uint8_t *data, int
tc = state->sbox[state->index_i];
state->sbox[state->index_i] = state->sbox[state->index_j];
state->sbox[state->index_j] = tc;
-
+
t = state->sbox[state->index_i] + state->sbox[state->index_j];
data[ind] = data[ind] ^ state->sbox[t];
}
@@ -68,7 +69,7 @@ _PUBLIC_ void arcfour_crypt_sbox(struct arcfour_state *state,
uint8_t *data, int
/*
arcfour encryption with a blob key
*/
-_PUBLIC_ void arcfour_crypt_blob(uint8_t *data, int len, const DATA_BLOB *key)
+_PUBLIC_ void arcfour_crypt_blob(uint8_t *data, int len, const DATA_BLOB *key)
{
struct arcfour_state state;
arcfour_init(&state, key);
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 4f108d9..4ce3a1d 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -190,6 +190,7 @@ bool update_num_read_oplocks(files_struct *fsp, struct
share_mode_lock *lck)
/*
* If we're the only one, we don't need a brlock entry
*/
+ remove_stale_share_mode_entries(d);
SMB_ASSERT(d->num_share_modes == 1);
SMB_ASSERT(EXCLUSIVE_OPLOCK_TYPE(d->share_modes[0].op_type));
return true;
diff --git a/source3/torture/msg_source.c b/source3/torture/msg_source.c
index 293b099..c15f24d 100644
--- a/source3/torture/msg_source.c
+++ b/source3/torture/msg_source.c
@@ -110,7 +110,7 @@ int main(int argc, const char *argv[])
struct messaging_context *msg_ctx;
struct tevent_req *req;
int ret;
- struct server_id id;
+ struct server_id my_id, id;
if (argc != 2) {
fprintf(stderr, "Usage: %s <dst>\n", argv[0]);
@@ -130,8 +130,9 @@ int main(int argc, const char *argv[])
perror("messaging_init failed");
return -1;
}
+ my_id = messaging_server_id(msg_ctx);
- id = server_id_from_string(get_my_vnn(), argv[1]);
+ id = server_id_from_string(my_id.vnn, argv[1]);
if (!procid_valid(&id)) {
fprintf(stderr, "pid %s invalid\n", argv[1]);
return -1;
--
Samba Shared Repository
