[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Fri Dec 16 08:30:04 MST 2011
The branch, master has been updated
via 16bd41b s3:printing/spoolssd: avoid using server_messaging_context()
via cbb67e9 s3:smbd: remove unused sconn_server_id()
via 704cf10 s3:smbd: avoid using sconn_server_id()
via fe7c519 s3:locking: avoid using sconn_server_id()
via f166f91 s3:lib/conn_tdb: avoid using sconn_server_id()
from 35605fa s4:libcli/rap: the caller should get talloc children from call->ndr_pull_{param,data}
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 16bd41b7e708a6891da1ad812e20b0988f7ac79f
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Dec 15 11:57:24 2011 +0100
s3:printing/spoolssd: avoid using server_messaging_context()
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Fri Dec 16 16:29:41 CET 2011 on sn-devel-104
commit cbb67e9e2e1c2b27fdca356b9f82642cb10a985d
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Dec 15 11:54:01 2011 +0100
s3:smbd: remove unused sconn_server_id()
metze
commit 704cf106451466efe0b53254d152dad6fd8ac5ef
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Dec 15 11:51:20 2011 +0100
s3:smbd: avoid using sconn_server_id()
metze
commit fe7c5198a25b7f4b65706d46e3c94cf982410edb
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Dec 15 11:50:43 2011 +0100
s3:locking: avoid using sconn_server_id()
metze
commit f166f919882c9b79cca70af73fefd0b3b54bc2a6
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Dec 15 11:50:01 2011 +0100
s3:lib/conn_tdb: avoid using sconn_server_id()
metze
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 1 -
source3/lib/conn_tdb.c | 3 ++-
source3/lib/util_sconn.c | 27 ---------------------------
source3/locking/brlock.c | 2 +-
source3/locking/locking.c | 12 ++++++------
source3/printing/spoolssd.c | 2 +-
source3/smbd/blocking.c | 14 +++++++-------
source3/smbd/connection.c | 3 ++-
source3/smbd/globals.h | 2 --
source3/smbd/negprot.c | 2 +-
source3/smbd/open.c | 6 +++---
source3/smbd/server_exit.c | 3 ++-
source3/smbd/service.c | 3 ++-
source3/smbd/session.c | 3 ++-
source3/smbd/smb2_create.c | 3 ++-
source3/smbd/smb2_lock.c | 6 +++---
source3/wscript_build | 1 -
17 files changed, 34 insertions(+), 59 deletions(-)
delete mode 100644 source3/lib/util_sconn.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1389293..cf7c5ae 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -441,7 +441,6 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
../lib/socket/interfaces.o lib/memcache.o \
lib/talloc_dict.o \
lib/serverid.o \
- lib/util_sconn.o \
lib/util_transfer_file.o ../lib/async_req/async_sock.o \
lib/addrchange.o \
$(TDB_LIB_OBJ) \
diff --git a/source3/lib/conn_tdb.c b/source3/lib/conn_tdb.c
index 72ba7c6..f600871 100644
--- a/source3/lib/conn_tdb.c
+++ b/source3/lib/conn_tdb.c
@@ -22,6 +22,7 @@
#include "smbd/globals.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
+#include "messages.h"
static struct db_context *connections_db_ctx(bool rw)
{
@@ -59,7 +60,7 @@ struct db_record *connections_fetch_entry(TALLOC_CTX *mem_ctx,
TDB_DATA key;
ZERO_STRUCT(ckey);
- ckey.pid = sconn_server_id(conn->sconn);
+ ckey.pid = messaging_server_id(conn->sconn->msg_ctx);
ckey.cnum = conn->cnum;
strlcpy(ckey.name, name, sizeof(ckey.name));
diff --git a/source3/lib/util_sconn.c b/source3/lib/util_sconn.c
deleted file mode 100644
index 51ba29e..0000000
--- a/source3/lib/util_sconn.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Implementation of a reliable server_exists()
- Copyright (C) Volker Lendecke 2010
-
- 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/>.
-*/
-
-#include "includes.h"
-#include "smbd/globals.h"
-#include "messages.h"
-
-struct server_id sconn_server_id(const struct smbd_server_connection *sconn)
-{
- return messaging_server_id(sconn->msg_ctx);
-}
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 33c9243..a33d809 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -1489,7 +1489,7 @@ void brl_close_fnum(struct messaging_context *msg_ctx,
int fnum = fsp->fnum;
unsigned int i;
struct lock_struct *locks = br_lck->lock_data;
- struct server_id pid = sconn_server_id(fsp->conn->sconn);
+ struct server_id pid = messaging_server_id(fsp->conn->sconn->msg_ctx);
struct lock_struct *locks_copy;
unsigned int num_locks_copy;
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 35ae758..45c2ce9 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -96,7 +96,7 @@ void init_strict_lock_struct(files_struct *fsp,
plock->context.smblctx = smblctx;
plock->context.tid = fsp->conn->cnum;
- plock->context.pid = sconn_server_id(fsp->conn->sconn);
+ plock->context.pid = messaging_server_id(fsp->conn->sconn->msg_ctx);
plock->start = start;
plock->size = size;
plock->fnum = fsp->fnum;
@@ -198,7 +198,7 @@ NTSTATUS query_lock(files_struct *fsp,
return brl_lockquery(br_lck,
psmblctx,
- sconn_server_id(fsp->conn->sconn),
+ messaging_server_id(fsp->conn->sconn->msg_ctx),
poffset,
pcount,
plock_type,
@@ -284,7 +284,7 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx,
*perr = brl_lock(msg_ctx,
br_lck,
smblctx,
- sconn_server_id(fsp->conn->sconn),
+ messaging_server_id(fsp->conn->sconn->msg_ctx),
offset,
count,
lock_type,
@@ -333,7 +333,7 @@ NTSTATUS do_unlock(struct messaging_context *msg_ctx,
ok = brl_unlock(msg_ctx,
br_lck,
smblctx,
- sconn_server_id(fsp->conn->sconn),
+ messaging_server_id(fsp->conn->sconn->msg_ctx),
offset,
count,
lock_flav);
@@ -383,7 +383,7 @@ NTSTATUS do_lock_cancel(files_struct *fsp,
ok = brl_lock_cancel(br_lck,
smblctx,
- sconn_server_id(fsp->conn->sconn),
+ messaging_server_id(fsp->conn->sconn->msg_ctx),
offset,
count,
lock_flav,
@@ -959,7 +959,7 @@ static void fill_share_mode_entry(struct share_mode_entry *e,
uid_t uid, uint64_t mid, uint16 op_type)
{
ZERO_STRUCTP(e);
- e->pid = sconn_server_id(fsp->conn->sconn);
+ e->pid = messaging_server_id(fsp->conn->sconn->msg_ctx);
e->share_access = fsp->share_access;
e->private_options = fsp->fh->private_options;
e->access_mask = fsp->access_mask;
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index fa722e2..9a5d1b0 100644
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -281,7 +281,7 @@ static bool spoolss_child_init(struct tevent_context *ev_ctx,
{
NTSTATUS status;
struct rpc_srv_callbacks spoolss_cb;
- struct messaging_context *msg_ctx = server_messaging_context();
+ struct messaging_context *msg_ctx = messaging_init(NULL, ev_ctx);
bool ok;
status = reinit_after_fork(msg_ctx, ev_ctx,
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index cd6967e..028adce 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -225,7 +225,7 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck,
status = brl_lock(req->sconn->msg_ctx,
br_lck,
smblctx,
- sconn_server_id(req->sconn),
+ messaging_server_id(req->sconn->msg_ctx),
offset,
count,
lock_type == READ_LOCK ? PENDING_READ_LOCK : PENDING_WRITE_LOCK,
@@ -302,7 +302,7 @@ static void generic_blocking_lock_error(struct blocking_lock_record *blr, NTSTAT
fsp->last_lock_failure.context.smblctx = blr->smblctx;
fsp->last_lock_failure.context.tid = fsp->conn->cnum;
fsp->last_lock_failure.context.pid =
- sconn_server_id(fsp->conn->sconn);
+ messaging_server_id(fsp->conn->sconn->msg_ctx);
fsp->last_lock_failure.start = blr->offset;
fsp->last_lock_failure.size = blr->count;
fsp->last_lock_failure.fnum = fsp->fnum;
@@ -616,7 +616,7 @@ void smbd_cancel_pending_lock_requests_by_fid(files_struct *fsp,
brl_lock_cancel(br_lck,
blr->smblctx,
- sconn_server_id(sconn),
+ messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
blr->lock_flav,
@@ -659,7 +659,7 @@ void remove_pending_lock_requests_by_mid_smb1(
brl_lock_cancel(br_lck,
blr->smblctx,
- sconn_server_id(sconn),
+ messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
blr->lock_flav,
@@ -758,7 +758,7 @@ void process_blocking_lock_queue(struct smbd_server_connection *sconn)
if (br_lck) {
brl_lock_cancel(br_lck,
blr->smblctx,
- sconn_server_id(sconn),
+ messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
blr->lock_flav,
@@ -795,7 +795,7 @@ void process_blocking_lock_queue(struct smbd_server_connection *sconn)
brl_lock_cancel(br_lck,
blr->smblctx,
- sconn_server_id(sconn),
+ messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
blr->lock_flav,
@@ -908,7 +908,7 @@ struct blocking_lock_record *blocking_lock_cancel_smb1(files_struct *fsp,
memcpy(msg, &blr, sizeof(blr));
memcpy(&msg[sizeof(blr)], &err, sizeof(NTSTATUS));
- messaging_send_buf(sconn->msg_ctx, sconn_server_id(sconn),
+ messaging_send_buf(sconn->msg_ctx, messaging_server_id(sconn->msg_ctx),
MSG_SMB_BLOCKING_LOCK_CANCEL,
(uint8 *)&msg, sizeof(msg));
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index 5a9f407..38615d5 100644
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -23,6 +23,7 @@
#include "dbwrap/dbwrap.h"
#include "auth.h"
#include "../lib/tsocket/tsocket.h"
+#include "messages.h"
/****************************************************************************
Delete a connection record.
@@ -167,7 +168,7 @@ bool claim_connection(connection_struct *conn, const char *name)
/* fill in the crec */
ZERO_STRUCT(crec);
crec.magic = 0x280267;
- crec.pid = sconn_server_id(conn->sconn);
+ crec.pid = messaging_server_id(conn->sconn->msg_ctx);
crec.cnum = conn->cnum;
crec.uid = conn->session_info->unix_token->uid;
crec.gid = conn->session_info->unix_token->gid;
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 3c6aa12..76172b0 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -226,8 +226,6 @@ void smbd_server_connection_terminate_ex(struct smbd_server_connection *sconn,
#define smbd_server_connection_terminate(sconn, reason) \
smbd_server_connection_terminate_ex(sconn, reason, __location__)
-struct server_id sconn_server_id(const struct smbd_server_connection *sconn);
-
const char *smb2_opcode_name(uint16_t opcode);
bool smbd_is_smb2_header(const uint8_t *inbuf, size_t size);
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 52ef96d..0b5b810 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -720,7 +720,7 @@ void reply_negprot(struct smb_request *req)
when the client connects to port 445. Of course there is a small
window where we are listening to messages -- jerry */
- serverid_register(sconn_server_id(sconn),
+ serverid_register(messaging_server_id(sconn->msg_ctx),
FLAG_MSG_GENERAL|FLAG_MSG_SMBD
|FLAG_MSG_PRINT_GENERAL);
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 8b7b47b..86291ae 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1312,7 +1312,7 @@ static void defer_open(struct share_mode_lock *lck,
exit_server("push_deferred_open_message_smb failed");
}
add_deferred_open(lck, req->mid, request_time,
- sconn_server_id(req->sconn), state->id);
+ messaging_server_id(req->sconn->msg_ctx), state->id);
}
@@ -1727,7 +1727,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
/* Remove the deferred open entry under lock. */
remove_deferred_open_entry(
state->id, req->mid,
- sconn_server_id(req->sconn));
+ messaging_server_id(req->sconn->msg_ctx));
/* Ensure we don't reprocess this message. */
remove_deferred_open_message_smb(req->sconn, req->mid);
@@ -2500,7 +2500,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
* records. */
if (req != NULL) {
del_deferred_open_entry(lck, req->mid,
- sconn_server_id(req->sconn));
+ messaging_server_id(req->sconn->msg_ctx));
}
TALLOC_FREE(lck);
diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index 05a4ece..4e10a09 100644
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -43,6 +43,7 @@
#include "printing/notify.h"
#include "printing.h"
#include "serverid.h"
+#include "messages.h"
static struct files_struct *log_writeable_file_fn(
struct files_struct *fsp, void *private_data)
@@ -113,7 +114,7 @@ static void exit_server_common(enum server_exit_reason how,
/*
* For children the parent takes care of cleaning up
*/
- serverid_deregister(sconn_server_id(sconn));
+ serverid_deregister(messaging_server_id(sconn->msg_ctx));
}
#ifdef WITH_DFS
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index bd762c7..6d6f963 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -29,6 +29,7 @@
#include "passdb/lookup_sid.h"
#include "auth.h"
#include "lib/param/loadparm.h"
+#include "messages.h"
extern userdom_struct current_user_info;
@@ -716,7 +717,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
if ((!conn->printer) && (!conn->ipc)) {
conn->notify_ctx = notify_init(conn,
- sconn_server_id(sconn),
+ messaging_server_id(sconn->msg_ctx),
sconn->msg_ctx,
sconn->ev_ctx,
conn);
diff --git a/source3/smbd/session.c b/source3/smbd/session.c
index 0797d1b..1d89122 100644
--- a/source3/smbd/session.c
+++ b/source3/smbd/session.c
@@ -34,6 +34,7 @@
#include "auth.h"
#include "../lib/tsocket/tsocket.h"
#include "../libcli/security/security.h"
+#include "messages.h"
/********************************************************************
called when a session is created
@@ -41,7 +42,7 @@
bool session_claim(struct smbd_server_connection *sconn, user_struct *vuser)
{
- struct server_id pid = sconn_server_id(sconn);
+ struct server_id pid = messaging_server_id(sconn->msg_ctx);
TDB_DATA data;
int i = 0;
struct sessionid sessionid;
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 302cfd7..6218592 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -26,6 +26,7 @@
#include "../libcli/smb/smb_common.h"
#include "../librpc/gen_ndr/ndr_security.h"
#include "../lib/util/tevent_ntstatus.h"
+#include "messages.h"
int map_smb2_oplock_levels_to_samba(uint8_t in_oplock_level)
{
@@ -1168,7 +1169,7 @@ static bool smbd_smb2_create_cancel(struct tevent_req *req)
mid = get_mid_from_smb2req(smb2req);
remove_deferred_open_entry(state->id, mid,
- sconn_server_id(smb2req->sconn));
+ messaging_server_id(smb2req->sconn->msg_ctx));
remove_deferred_open_message_smb2_internal(smb2req, mid);
smb2req->cancelled = true;
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 10b35df..fdca266 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -637,7 +637,7 @@ bool push_blocking_lock_request_smb2( struct byte_range_lock *br_lck,
status = brl_lock(sconn->msg_ctx,
br_lck,
smblctx,
- sconn_server_id(sconn),
+ messaging_server_id(sconn->msg_ctx),
offset,
count,
lock_type == READ_LOCK ? PENDING_READ_LOCK : PENDING_WRITE_LOCK,
@@ -689,7 +689,7 @@ static void remove_pending_lock(struct smbd_smb2_lock_state *state,
if (br_lck) {
brl_lock_cancel(br_lck,
blr->smblctx,
- sconn_server_id(blr->fsp->conn->sconn),
+ messaging_server_id(blr->fsp->conn->sconn->msg_ctx),
blr->offset,
blr->count,
blr->lock_flav,
@@ -909,7 +909,7 @@ void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp,
/* Remove the entries from the lock db. */
brl_lock_cancel(br_lck,
blr->smblctx,
- sconn_server_id(sconn),
+ messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
blr->lock_flav,
diff --git a/source3/wscript_build b/source3/wscript_build
index 4fe432b..8ac6cc0 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -47,7 +47,6 @@ LIB_SRC = '''
lib/messages_ctdbd.c lib/ctdb_packet.c lib/ctdbd_conn.c
lib/id_cache.c
lib/talloc_dict.c
- lib/util_sconn.c
lib/serverid.c
lib/util_transfer_file.c
lib/addrchange.c
--
Samba Shared Repository
More information about the samba-cvs
mailing list