*/
#include "includes.h"
+#include "smbXsrv_session.h"
#include "system/filesys.h"
#include <tevent.h>
#include "lib/util/server_id.h"
#include "serverid.h"
#include "lib/util/tevent_ntstatus.h"
#include "lib/global_contexts.h"
+#include "source3/include/util_tdb.h"
struct smbXsrv_session_table {
struct {
}
backend = db_open(NULL, global_path,
- 0, /* hash_size */
- TDB_DEFAULT |
- TDB_CLEAR_IF_FIRST |
- TDB_INCOMPATIBLE_HASH,
+ SMBD_VOLATILE_TDB_HASH_SIZE,
+ SMBD_VOLATILE_TDB_FLAGS,
O_RDWR | O_CREAT, 0600,
DBWRAP_LOCK_ORDER_1,
DBWRAP_FLAG_NONE);
if (rec == NULL) {
DBG_DEBUG("Failed to lock global id 0x%08x, key '%s'\n", id,
- hex_encode_talloc(talloc_tos(), key.dptr, key.dsize));
+ tdb_data_dbg(key));
}
return rec;
if (rec == NULL) {
DBG_DEBUG("Failed to lock local id 0x%08x, key '%s'\n", id,
- hex_encode_talloc(talloc_tos(), key.dptr, key.dsize));
+ tdb_data_dbg(key));
}
return rec;
(ndr_pull_flags_fn_t)ndr_pull_smbXsrv_session_closeB);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
status = ndr_map_error2ntstatus(ndr_err);
- DEBUG(1,("smbXsrv_session_close_loop: "
- "ndr_pull_struct_blob - %s\n",
- nt_errstr(status)));
+ DBG_WARNING("ndr_pull_struct_blob - %s\n", nt_errstr(status));
goto next;
}
- DEBUG(10,("smbXsrv_session_close_loop: MSG_SMBXSRV_SESSION_CLOSE\n"));
- if (DEBUGLVL(10)) {
+ DBG_DEBUG("MSG_SMBXSRV_SESSION_CLOSE\n");
+ if (DEBUGLVL(DBGLVL_DEBUG)) {
NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
}
if (close_blob.version != SMBXSRV_VERSION_0) {
- DEBUG(0,("smbXsrv_session_close_loop: "
- "ignore invalid version %u\n", close_blob.version));
+ DBG_ERR("ignore invalid version %u\n", close_blob.version);
NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
goto next;
}
close_info0 = close_blob.info.info0;
if (close_info0 == NULL) {
- DEBUG(0,("smbXsrv_session_close_loop: "
- "ignore NULL info %u\n", close_blob.version));
+ DBG_ERR("ignore NULL info %u\n", close_blob.version);
NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
goto next;
}
close_info0->old_session_wire_id,
now, &session);
if (NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED)) {
- DEBUG(4,("smbXsrv_session_close_loop: "
- "old_session_wire_id %llu not found\n",
- (unsigned long long)close_info0->old_session_wire_id));
- if (DEBUGLVL(4)) {
+ DBG_INFO("old_session_wire_id %" PRIu64 " not found\n",
+ close_info0->old_session_wire_id);
+ if (DEBUGLVL(DBGLVL_INFO)) {
NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
}
goto next;
if (!NT_STATUS_IS_OK(status) &&
!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED) &&
!NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_SESSION_EXPIRED)) {
- DEBUG(1,("smbXsrv_session_close_loop: "
- "old_session_wire_id %llu - %s\n",
- (unsigned long long)close_info0->old_session_wire_id,
- nt_errstr(status)));
- if (DEBUGLVL(1)) {
+ DBG_WARNING("old_session_wire_id %" PRIu64 " - %s\n",
+ close_info0->old_session_wire_id,
+ nt_errstr(status));
+ if (DEBUGLVL(DBGLVL_WARNING)) {
NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
}
goto next;
}
if (session->global->session_global_id != close_info0->old_session_global_id) {
- DEBUG(1,("smbXsrv_session_close_loop: "
- "old_session_wire_id %llu - global %u != %u\n",
- (unsigned long long)close_info0->old_session_wire_id,
- session->global->session_global_id,
- close_info0->old_session_global_id));
- if (DEBUGLVL(1)) {
+ DBG_WARNING("old_session_wire_id %" PRIu64 " - "
+ "global %" PRIu32 " != %" PRIu32 "\n",
+ close_info0->old_session_wire_id,
+ session->global->session_global_id,
+ close_info0->old_session_global_id);
+ if (DEBUGLVL(DBGLVL_WARNING)) {
NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
}
goto next;
}
if (session->global->creation_time != close_info0->old_creation_time) {
- DEBUG(1,("smbXsrv_session_close_loop: "
- "old_session_wire_id %llu - "
- "creation %s (%llu) != %s (%llu)\n",
- (unsigned long long)close_info0->old_session_wire_id,
- nt_time_string(rec, session->global->creation_time),
- (unsigned long long)session->global->creation_time,
- nt_time_string(rec, close_info0->old_creation_time),
- (unsigned long long)close_info0->old_creation_time));
- if (DEBUGLVL(1)) {
+ DBG_WARNING("old_session_wire_id %" PRIu64 " - "
+ "creation %s (%" PRIu64 ") != %s (%" PRIu64 ")\n",
+ close_info0->old_session_wire_id,
+ nt_time_string(rec,
+ session->global->creation_time),
+ session->global->creation_time,
+ nt_time_string(rec,
+ close_info0->old_creation_time),
+ close_info0->old_creation_time);
+ if (DEBUGLVL(DBGLVL_WARNING)) {
NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
}
goto next;
session, NULL);
if (subreq == NULL) {
status = NT_STATUS_NO_MEMORY;
- DEBUG(0, ("smbXsrv_session_close_loop: "
- "smb2srv_session_shutdown_send(%llu) failed: %s\n",
- (unsigned long long)session->global->session_wire_id,
- nt_errstr(status)));
- if (DEBUGLVL(1)) {
+ DBG_ERR("smb2srv_session_shutdown_send(%" PRIu64
+ ") failed: %s\n",
+ session->global->session_wire_id,
+ nt_errstr(status));
+ if (DEBUGLVL(DBGLVL_WARNING)) {
NDR_PRINT_DEBUG(smbXsrv_session_closeB, &close_blob);
}
goto next;
status = smb2srv_session_shutdown_recv(subreq);
TALLOC_FREE(subreq);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("smbXsrv_session_close_loop: "
- "smb2srv_session_shutdown_recv(%llu) failed: %s\n",
- (unsigned long long)session->global->session_wire_id,
- nt_errstr(status)));
+ DBG_ERR("smb2srv_session_shutdown_recv(%" PRIu64
+ ") failed: %s\n",
+ session->global->session_wire_id,
+ nt_errstr(status));
}
status = smbXsrv_session_logoff(session);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("smbXsrv_session_close_loop: "
- "smbXsrv_session_logoff(%llu) failed: %s\n",
- (unsigned long long)session->global->session_wire_id,
- nt_errstr(status)));
+ DBG_ERR("smbXsrv_session_logoff(%" PRIu64 ") failed: %s\n",
+ session->global->session_wire_id,
+ nt_errstr(status));
}
TALLOC_FREE(session);
bool *is_free,
bool *was_free,
TALLOC_CTX *mem_ctx,
- struct smbXsrv_session_global0 **_g);
+ struct smbXsrv_session_global0 **_g,
+ uint32_t *pseqnum);
static NTSTATUS smbXsrv_session_global_allocate(struct db_context *db,
TALLOC_CTX *mem_ctx,
smbXsrv_session_global_verify_record(global->db_rec,
&is_free,
&was_free,
- NULL, NULL);
+ NULL, NULL, NULL);
if (!is_free) {
TALLOC_FREE(global->db_rec);
bool *is_free,
bool *was_free,
TALLOC_CTX *mem_ctx,
- struct smbXsrv_session_global0 **_g)
+ struct smbXsrv_session_global0 **_g,
+ uint32_t *pseqnum)
{
TDB_DATA key;
TDB_DATA val;
if (_g) {
*_g = NULL;
}
+ if (pseqnum) {
+ *pseqnum = 0;
+ }
key = dbwrap_record_get_key(db_rec);
(ndr_pull_flags_fn_t)ndr_pull_smbXsrv_session_globalB);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
- DEBUG(1,("smbXsrv_session_global_verify_record: "
- "key '%s' ndr_pull_struct_blob - %s\n",
- hex_encode_talloc(frame, key.dptr, key.dsize),
- nt_errstr(status)));
+ DBG_WARNING("key '%s' ndr_pull_struct_blob - %s\n",
+ tdb_data_dbg(key),
+ nt_errstr(status));
TALLOC_FREE(frame);
*is_free = true;
if (was_free) {
return;
}
- DEBUG(10,("smbXsrv_session_global_verify_record\n"));
- if (DEBUGLVL(10)) {
+ DBG_DEBUG("smbXsrv_session_global_verify_record\n");
+ if (DEBUGLVL(DBGLVL_DEBUG)) {
NDR_PRINT_DEBUG(smbXsrv_session_globalB, &global_blob);
}
if (global_blob.version != SMBXSRV_VERSION_0) {
- DEBUG(0,("smbXsrv_session_global_verify_record: "
- "key '%s' use unsupported version %u\n",
- hex_encode_talloc(frame, key.dptr, key.dsize),
- global_blob.version));
+ DBG_ERR("key '%s' use unsupported version %u\n",
+ tdb_data_dbg(key),
+ global_blob.version);
NDR_PRINT_DEBUG(smbXsrv_session_globalB, &global_blob);
TALLOC_FREE(frame);
*is_free = true;
exists = serverid_exists(&global->channels[0].server_id);
if (!exists) {
struct server_id_buf idbuf;
- DEBUG(2,("smbXsrv_session_global_verify_record: "
- "key '%s' server_id %s does not exist.\n",
- hex_encode_talloc(frame, key.dptr, key.dsize),
- server_id_str_buf(global->channels[0].server_id,
- &idbuf)));
- if (DEBUGLVL(2)) {
+ DBG_NOTICE("key '%s' server_id %s does not exist.\n",
+ tdb_data_dbg(key),
+ server_id_str_buf(global->channels[0].server_id,
+ &idbuf));
+ if (DEBUGLVL(DBGLVL_NOTICE)) {
NDR_PRINT_DEBUG(smbXsrv_session_globalB, &global_blob);
}
TALLOC_FREE(frame);
if (_g) {
*_g = talloc_move(mem_ctx, &global);
}
+ if (pseqnum) {
+ *pseqnum = global_blob.seqnum;
+ }
TALLOC_FREE(frame);
}
* store the information in the old format.
*/
- if (global->db_rec == NULL) {
- return NT_STATUS_INTERNAL_ERROR;
- }
-
key = dbwrap_record_get_key(global->db_rec);
val = dbwrap_record_get_value(global->db_rec);
- ZERO_STRUCT(global_blob);
- global_blob.version = smbXsrv_version_global_current();
+ global_blob = (struct smbXsrv_session_globalB){
+ .version = smbXsrv_version_global_current(),
+ .info.info0 = global,
+ };
+
if (val.dsize >= 8) {
global_blob.seqnum = IVAL(val.dptr, 4);
}
global_blob.seqnum += 1;
- global_blob.info.info0 = global;
- ndr_err = ndr_push_struct_blob(&blob, global->db_rec, &global_blob,
- (ndr_push_flags_fn_t)ndr_push_smbXsrv_session_globalB);
+ ndr_err = ndr_push_struct_blob(
+ &blob,
+ talloc_tos(),
+ &global_blob,
+ (ndr_push_flags_fn_t)ndr_push_smbXsrv_session_globalB);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
status = ndr_map_error2ntstatus(ndr_err);
- DEBUG(1,("smbXsrv_session_global_store: key '%s' ndr_push - %s\n",
- hex_encode_talloc(global->db_rec, key.dptr, key.dsize),
- nt_errstr(status)));
+ DBG_WARNING("key '%s' ndr_push - %s\n",
+ tdb_data_dbg(key),
+ nt_errstr(status));
TALLOC_FREE(global->db_rec);
return status;
}
val = make_tdb_data(blob.data, blob.length);
status = dbwrap_record_store(global->db_rec, val, TDB_REPLACE);
+ TALLOC_FREE(blob.data);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1,("smbXsrv_session_global_store: key '%s' store - %s\n",
- hex_encode_talloc(global->db_rec, key.dptr, key.dsize),
- nt_errstr(status)));
+ DBG_WARNING("key '%s' store - %s\n",
+ tdb_data_dbg(key),
+ nt_errstr(status));
TALLOC_FREE(global->db_rec);
return status;
}
- if (DEBUGLVL(10)) {
- DEBUG(10,("smbXsrv_session_global_store: key '%s' stored\n",
- hex_encode_talloc(global->db_rec, key.dptr, key.dsize)));
+ if (DEBUGLVL(DBGLVL_DEBUG)) {
+ DBG_DEBUG("key '%s' stored\n", tdb_data_dbg(key));
NDR_PRINT_DEBUG(smbXsrv_session_globalB, &global_blob);
}
uint64_t previous_session_id;
uint64_t current_session_id;
struct db_record *db_rec;
+ uint64_t watch_instance;
+ uint32_t last_seqnum;
};
+static void smb2srv_session_close_previous_cleanup(struct tevent_req *req,
+ enum tevent_req_state req_state)
+{
+ struct smb2srv_session_close_previous_state *state =
+ tevent_req_data(req,
+ struct smb2srv_session_close_previous_state);
+
+ if (state->db_rec != NULL) {
+ dbwrap_watched_watch_remove_instance(state->db_rec,
+ state->watch_instance);
+ state->watch_instance = 0;
+ TALLOC_FREE(state->db_rec);
+ }
+}
+
static void smb2srv_session_close_previous_check(struct tevent_req *req);
static void smb2srv_session_close_previous_modified(struct tevent_req *subreq);
uint64_t previous_session_id,
uint64_t current_session_id)
{
- struct tevent_req *req;
- struct smb2srv_session_close_previous_state *state;
+ struct tevent_req *req = NULL;
+ struct smb2srv_session_close_previous_state *state = NULL;
uint32_t global_id = previous_session_id & UINT32_MAX;
uint64_t global_zeros = previous_session_id & 0xFFFFFFFF00000000LLU;
struct smbXsrv_session_table *table = conn->client->session_table;
state->previous_session_id = previous_session_id;
state->current_session_id = current_session_id;
+ tevent_req_set_cleanup_fn(req, smb2srv_session_close_previous_cleanup);
+
if (global_zeros != 0) {
tevent_req_done(req);
return tevent_req_post(req, ev);
}
current_token = session_info->security_token;
- if (current_token->num_sids > PRIMARY_USER_SID_INDEX) {
- state->current_sid = ¤t_token->sids[PRIMARY_USER_SID_INDEX];
- }
-
- if (state->current_sid == NULL) {
+ if (current_token->num_sids <= PRIMARY_USER_SID_INDEX) {
tevent_req_done(req);
return tevent_req_post(req, ev);
}
+ state->current_sid = ¤t_token->sids[PRIMARY_USER_SID_INDEX];
if (!security_token_has_nt_authenticated_users(current_token)) {
/* TODO */
struct tevent_req *subreq = NULL;
NTSTATUS status;
bool is_free = false;
+ uint32_t seqnum = 0;
smbXsrv_session_global_verify_record(state->db_rec,
&is_free,
NULL,
state,
- &global);
+ &global,
+ &seqnum);
if (is_free) {
- TALLOC_FREE(state->db_rec);
tevent_req_done(req);
return;
}
if (global->auth_session_info == NULL) {
- TALLOC_FREE(state->db_rec);
tevent_req_done(req);
return;
}
previous_token = global->auth_session_info->security_token;
if (!security_token_is_sid(previous_token, state->current_sid)) {
- TALLOC_FREE(state->db_rec);
tevent_req_done(req);
return;
}
+ /*
+ * If the record changed, but we are not happy with the change yet,
+ * we better remove ourself from the waiter list
+ * (most likely the first position)
+ * and re-add us at the end of the list.
+ *
+ * This gives other waiters a change
+ * to make progress.
+ *
+ * Otherwise we'll keep our waiter instance alive,
+ * keep waiting (most likely at first position).
+ * It means the order of watchers stays fair.
+ */
+ if (state->last_seqnum != seqnum) {
+ state->last_seqnum = seqnum;
+ dbwrap_watched_watch_remove_instance(state->db_rec,
+ state->watch_instance);
+ state->watch_instance =
+ dbwrap_watched_watch_add_instance(state->db_rec);
+ }
+
subreq = dbwrap_watched_watch_send(state, state->ev, state->db_rec,
+ state->watch_instance,
(struct server_id){0});
if (tevent_req_nomem(subreq, req)) {
- TALLOC_FREE(state->db_rec);
return;
}
tevent_req_set_callback(subreq,
smb2srv_session_close_previous_modified,
req);
- close_info0.old_session_global_id = global->session_global_id;
- close_info0.old_session_wire_id = global->session_wire_id;
- close_info0.old_creation_time = global->creation_time;
- close_info0.new_session_wire_id = state->current_session_id;
+ close_info0 = (struct smbXsrv_session_close0){
+ .old_session_global_id = global->session_global_id,
+ .old_session_wire_id = global->session_wire_id,
+ .old_creation_time = global->creation_time,
+ .new_session_wire_id = state->current_session_id,
+ };
- ZERO_STRUCT(close_blob);
- close_blob.version = smbXsrv_version_global_current();
- close_blob.info.info0 = &close_info0;
+ close_blob = (struct smbXsrv_session_closeB){
+ .version = smbXsrv_version_global_current(),
+ .info.info0 = &close_info0,
+ };
ndr_err = ndr_push_struct_blob(&blob, state, &close_blob,
(ndr_push_flags_fn_t)ndr_push_smbXsrv_session_closeB);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- TALLOC_FREE(state->db_rec);
status = ndr_map_error2ntstatus(ndr_err);
- DEBUG(1,("smb2srv_session_close_previous_check: "
- "old_session[%llu] new_session[%llu] ndr_push - %s\n",
- (unsigned long long)close_info0.old_session_wire_id,
- (unsigned long long)close_info0.new_session_wire_id,
- nt_errstr(status)));
+ DBG_WARNING("old_session[%" PRIu64 "] "
+ "new_session[%" PRIu64 "] ndr_push - %s\n",
+ close_info0.old_session_wire_id,
+ close_info0.new_session_wire_id,
+ nt_errstr(status));
tevent_req_nterror(req, status);
return;
}
status = messaging_send(conn->client->msg_ctx,
global->channels[0].server_id,
MSG_SMBXSRV_SESSION_CLOSE, &blob);
- TALLOC_FREE(state->db_rec);
+ TALLOC_FREE(global);
if (tevent_req_nterror(req, status)) {
return;
}
- TALLOC_FREE(global);
+ TALLOC_FREE(state->db_rec);
return;
}
struct smb2srv_session_close_previous_state);
uint32_t global_id;
NTSTATUS status;
+ uint64_t instance = 0;
- status = dbwrap_watched_watch_recv(subreq, NULL, NULL);
+ status = dbwrap_watched_watch_recv(subreq, &instance, NULL, NULL);
TALLOC_FREE(subreq);
if (tevent_req_nterror(req, status)) {
return;
}
+ state->watch_instance = instance;
+
global_id = state->previous_session_id & UINT32_MAX;
state->db_rec = smbXsrv_session_global_fetch_locked(
{
NTSTATUS status;
- DBG_DEBUG("destructing session(%llu)\n",
- (unsigned long long)session->global->session_wire_id);
+ DBG_DEBUG("destructing session(%" PRIu64 ")\n",
+ session->global->session_wire_id);
status = smbXsrv_session_clear_and_logoff(session);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("smbXsrv_session_destructor: "
- "smbXsrv_session_logoff() failed: %s\n",
- nt_errstr(status)));
+ DBG_ERR("smbXsrv_session_logoff() failed: %s\n",
+ nt_errstr(status));
}
TALLOC_FREE(session->global);
uint64_t id = global->session_global_id;
global->connection_dialect = conn->smb2.server.dialect;
+ global->client_guid = conn->smb2.client.guid;
global->session_wire_id = id;
status = smbXsrv_session_global_store(global);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("smbXsrv_session_create: "
- "global_id (0x%08x) store failed - %s\n",
- session->global->session_global_id,
- nt_errstr(status)));
+ DBG_ERR("global_id (0x%08x) store failed - %s\n",
+ session->global->session_global_id,
+ nt_errstr(status));
TALLOC_FREE(session);
return status;
}
- if (DEBUGLVL(10)) {
+ if (DEBUGLVL(DBGLVL_DEBUG)) {
struct smbXsrv_sessionB session_blob = {
.version = SMBXSRV_VERSION_0,
.info.info0 = session,
};
- DEBUG(10,("smbXsrv_session_create: global_id (0x%08x) stored\n",
- session->global->session_global_id));
+ DBG_DEBUG("global_id (0x%08x) stored\n",
+ session->global->session_global_id);
NDR_PRINT_DEBUG(smbXsrv_sessionB, &session_blob);
}
global->channels = c;
c = &global->channels[global->num_channels];
- ZERO_STRUCTP(c);
- c->server_id = messaging_server_id(conn->client->msg_ctx);
- c->channel_id = conn->channel_id;
- c->creation_time = now;
+ *c = (struct smbXsrv_channel_global0){
+ .server_id = messaging_server_id(conn->client->msg_ctx),
+ .channel_id = conn->channel_id,
+ .creation_time = now,
+ .connection = conn,
+ };
+
c->local_address = tsocket_address_string(conn->local_address,
global->channels);
if (c->local_address == NULL) {
if (c->remote_name == NULL) {
return NT_STATUS_NO_MEMORY;
}
- c->connection = conn;
global->num_channels += 1;
NTSTATUS status;
if (session->global->db_rec != NULL) {
- DEBUG(0, ("smbXsrv_session_update(0x%08x): "
+ DBG_ERR("smbXsrv_session_update(0x%08x): "
"Called with db_rec != NULL'\n",
- session->global->session_global_id));
+ session->global->session_global_id);
+ return NT_STATUS_INTERNAL_ERROR;
+ }
+
+ if (table == NULL) {
+ DBG_ERR("smbXsrv_session_update(0x%08x): "
+ "Called with table == NULL'\n",
+ session->global->session_global_id);
return NT_STATUS_INTERNAL_ERROR;
}
status = smbXsrv_session_global_store(session->global);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,("smbXsrv_session_update: "
- "global_id (0x%08x) store failed - %s\n",
- session->global->session_global_id,
- nt_errstr(status)));
+ DBG_ERR("global_id (0x%08x) store failed - %s\n",
+ session->global->session_global_id,
+ nt_errstr(status));
return status;
}
- if (DEBUGLVL(10)) {
+ if (DEBUGLVL(DBGLVL_DEBUG)) {
struct smbXsrv_sessionB session_blob = {
.version = SMBXSRV_VERSION_0,
.info.info0 = session,
};
- DEBUG(10,("smbXsrv_session_update: global_id (0x%08x) stored\n",
- session->global->session_global_id));
+ DBG_DEBUG("global_id (0x%08x) stored\n",
+ session->global->session_global_id);
NDR_PRINT_DEBUG(smbXsrv_sessionB, &session_blob);
}
return NT_STATUS_INTERNAL_ERROR;
}
- a = talloc_zero(session, struct smbXsrv_session_auth0);
+ a = talloc(session, struct smbXsrv_session_auth0);
if (a == NULL) {
return NT_STATUS_NO_MEMORY;
}
- a->session = session;
- a->connection = conn;
- a->in_flags = in_flags;
- a->in_security_mode = in_security_mode;
- a->creation_time = now;
- a->idle_time = now;
- a->channel_id = conn->channel_id;
- if (conn->protocol >= PROTOCOL_SMB3_10) {
+ *a = (struct smbXsrv_session_auth0){
+ .session = session,
+ .connection = conn,
+ .in_flags = in_flags,
+ .in_security_mode = in_security_mode,
+ .creation_time = now,
+ .idle_time = now,
+ .channel_id = conn->channel_id,
+ };
+
+ if (conn->protocol >= PROTOCOL_SMB3_11) {
a->preauth = talloc(a, struct smbXsrv_preauth);
if (a->preauth == NULL) {
TALLOC_FREE(session);
* We don't set a callback, as we just want to block the
* wait queue and the talloc_free() of the session will
* remove the item from the wait queue in order
- * to remove allow the connection to disapear.
+ * to remove allow the connection to disappear.
*/
if (xconn_wait_queue != NULL) {
subreq = tevent_queue_wait_send(session,
xconn_wait_queue);
if (subreq == NULL) {
status = NT_STATUS_NO_MEMORY;
- DBG_ERR("tevent_queue_wait_send() session(%llu) failed: %s\n",
- (unsigned long long)session->global->session_wire_id,
+ DBG_ERR("tevent_queue_wait_send() "
+ "session(%" PRIu64
+ ") failed: %s\n",
+ session->global
+ ->session_wire_id,
nt_errstr(status));
return status;
}
}
/*
- * This is garanteed to set
+ * This is guaranteed to set
* session->status = NT_STATUS_USER_SESSION_DELETED
* even if NULL is returned.
*/
NULL);
if (subreq == NULL) {
status = NT_STATUS_NO_MEMORY;
- DBG_ERR("smb2srv_session_shutdown_send(%llu) failed: %s\n",
- (unsigned long long)session->global->session_wire_id,
+ DBG_ERR("smb2srv_session_shutdown_send("
+ "%" PRIu64 " failed: %s\n",
+ session->global->session_wire_id,
nt_errstr(status));
return status;
}
status = smb2srv_session_shutdown_recv(subreq);
TALLOC_FREE(subreq);
if (!NT_STATUS_IS_OK(status)) {
- DBG_ERR("smb2srv_session_shutdown_recv(%llu) failed: %s\n",
- (unsigned long long)session->global->session_wire_id,
+ DBG_ERR("smb2srv_session_shutdown_recv(%" PRIu64
+ ") failed: %s\n",
+ session->global->session_wire_id,
nt_errstr(status));
}
status = smbXsrv_session_logoff(session);
if (!NT_STATUS_IS_OK(status)) {
- DBG_ERR("smbXsrv_session_logoff(%llu) failed: %s\n",
- (unsigned long long)session->global->session_wire_id,
+ DBG_ERR("smbXsrv_session_logoff(%" PRIu64 ") failed: %s\n",
+ session->global->session_wire_id,
nt_errstr(status));
}
struct smbXsrv_session *session,
struct smbd_smb2_request *current_req)
{
- struct tevent_req *req;
- struct smb2srv_session_shutdown_state *state;
- struct tevent_req *subreq;
+ struct tevent_req *req = NULL;
+ struct smb2srv_session_shutdown_state *state = NULL;
+ struct tevent_req *subreq = NULL;
struct smbXsrv_connection *xconn = NULL;
size_t len = 0;
*/
status = smb2srv_tcon_disconnect_all(session);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("smbXsrv_session_logoff(0x%08x): "
+ DBG_ERR("smbXsrv_session_logoff(0x%08x): "
"smb2srv_tcon_disconnect_all() failed: %s\n",
session->global->session_global_id,
- nt_errstr(status)));
+ nt_errstr(status));
error = status;
}
}
if (!NT_STATUS_IS_OK(status)) {
TDB_DATA key = dbwrap_record_get_key(global_rec);
- DEBUG(0, ("smbXsrv_session_logoff(0x%08x): "
+ DBG_ERR("smbXsrv_session_logoff(0x%08x): "
"failed to delete global key '%s': %s\n",
session->global->session_global_id,
- hex_encode_talloc(global_rec, key.dptr,
- key.dsize),
- nt_errstr(status)));
+ tdb_data_dbg(key),
+ nt_errstr(status));
error = status;
}
}
if (!NT_STATUS_IS_OK(status)) {
TDB_DATA key = dbwrap_record_get_key(local_rec);
- DEBUG(0, ("smbXsrv_session_logoff(0x%08x): "
+ DBG_ERR("smbXsrv_session_logoff(0x%08x): "
"failed to delete local key '%s': %s\n",
session->global->session_global_id,
- hex_encode_talloc(local_rec, key.dptr,
- key.dsize),
- nt_errstr(status)));
+ tdb_data_dbg(key),
+ nt_errstr(status));
error = status;
}
table->local.num_sessions -= 1;
NTSTATUS smbXsrv_session_logoff_all(struct smbXsrv_client *client)
{
struct smbXsrv_session_table *table = client->session_table;
- struct smbXsrv_session_logoff_all_state state;
+ struct smbXsrv_session_logoff_all_state state = {};
NTSTATUS status;
int count = 0;
if (table == NULL) {
- DEBUG(10, ("smbXsrv_session_logoff_all: "
- "empty session_table, nothing to do.\n"));
+ DBG_DEBUG("empty session_table, nothing to do.\n");
return NT_STATUS_OK;
}
- ZERO_STRUCT(state);
-
status = dbwrap_traverse(table->local.db_ctx,
smbXsrv_session_logoff_all_callback,
&state, &count);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("smbXsrv_session_logoff_all: "
- "dbwrap_traverse() failed: %s\n",
- nt_errstr(status)));
+ DBG_ERR("dbwrap_traverse() failed: %s\n", nt_errstr(status));
return status;
}
if (!NT_STATUS_IS_OK(state.first_status)) {
- DEBUG(0, ("smbXsrv_session_logoff_all: "
- "count[%d] errors[%d] first[%s]\n",
- count, state.errors,
- nt_errstr(state.first_status)));
+ DBG_ERR("count[%d] errors[%d] first[%s]\n",
+ count,
+ state.errors,
+ nt_errstr(state.first_status));
return state.first_status;
}
{
struct smbXsrv_client *client = xconn->client;
struct smbXsrv_session_table *table = client->session_table;
- struct smbXsrv_session_disconnect_xconn_state state;
+ struct smbXsrv_session_disconnect_xconn_state state = {
+ .xconn = xconn,
+ };
NTSTATUS status;
int count = 0;
return NT_STATUS_OK;
}
- ZERO_STRUCT(state);
- state.xconn = xconn;
-
status = dbwrap_traverse(table->local.db_ctx,
smbXsrv_session_disconnect_xconn_callback,
&state, &count);
struct smbXsrv_session_table *table = client->session_table;
uint8_t key_buf[SMBXSRV_SESSION_LOCAL_TDB_KEY_SIZE];
struct smbXsrv_session_local_fetch_state state = {
- .session = NULL,
.status = NT_STATUS_INTERNAL_ERROR,
};
TDB_DATA key;
struct smbXsrv_session_table *table = client->session_table;
uint8_t key_buf[SMBXSRV_SESSION_LOCAL_TDB_KEY_SIZE];
struct smbXsrv_session_local_fetch_state state = {
- .session = NULL,
.status = NT_STATUS_INTERNAL_ERROR,
};
TDB_DATA key;
* This means smb2_get_new_nonce() will return
* NT_STATUS_ENCRYPTION_FAILED.
*
- * But we intialize some random parts just in case...
+ * But we initialize some random parts just in case...
*/
session->nonce_high_max = session->nonce_high = 0;
generate_nonce_buffer((uint8_t *)&session->nonce_high_random,
&is_free,
NULL,
session,
- &session->global);
+ &session->global,
+ NULL);
if (is_free) {
TALLOC_FREE(frame);
return NT_STATUS_USER_SESSION_DELETED;
return NT_STATUS_NO_MEMORY;
}
session->global->signing_key->blob = session->global->signing_key_blob;
+ session->global->signing_flags = 0;
status = smb2_signing_key_cipher_create(session->global,
session->global->encryption_cipher,
return NT_STATUS_NO_MEMORY;
}
session->global->decryption_key->blob = session->global->decryption_key_blob;
+ session->global->encryption_flags = 0;
*_session = talloc_move(mem_ctx, &session);
TALLOC_FREE(frame);
ndr_err = ndr_pull_struct_blob(&blob, frame, &global_blob,
(ndr_pull_flags_fn_t)ndr_pull_smbXsrv_session_globalB);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- DEBUG(1,("Invalid record in smbXsrv_session_global.tdb:"
+ DBG_WARNING("Invalid record in smbXsrv_session_global.tdb:"
"key '%s' ndr_pull_struct_blob - %s\n",
- hex_encode_talloc(frame, key.dptr, key.dsize),
- ndr_errstr(ndr_err)));
+ tdb_data_dbg(key),
+ ndr_errstr(ndr_err));
goto done;
}
if (global_blob.version != SMBXSRV_VERSION_0) {
- DEBUG(1,("Invalid record in smbXsrv_session_global.tdb:"
+ DBG_WARNING("Invalid record in smbXsrv_session_global.tdb:"
"key '%s' unsupported version - %d\n",
- hex_encode_talloc(frame, key.dptr, key.dsize),
- (int)global_blob.version));
+ tdb_data_dbg(key),
+ (int)global_blob.version);
goto done;
}
if (global_blob.info.info0 == NULL) {
- DEBUG(1,("Invalid record in smbXsrv_tcon_global.tdb:"
+ DBG_WARNING("Invalid record in smbXsrv_tcon_global.tdb:"
"key '%s' info0 NULL pointer\n",
- hex_encode_talloc(frame, key.dptr, key.dsize)));
+ tdb_data_dbg(key));
goto done;
}
status = smbXsrv_session_global_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
unbecome_root();
- DEBUG(0, ("Failed to initialize session_global: %s\n",
- nt_errstr(status)));
+ DBG_ERR("Failed to initialize session_global: %s\n",
+ nt_errstr(status));
return status;
}