summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/blocking.c6
-rw-r--r--source3/smbd/conn.c2
-rw-r--r--source3/smbd/notify_internal.c2
-rw-r--r--source3/smbd/open.c2
-rw-r--r--source3/smbd/oplock.c10
-rw-r--r--source3/smbd/pipes.c2
-rw-r--r--source3/smbd/server.c14
7 files changed, 19 insertions, 19 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index d0caa29597..7fe9f0c3c7 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -73,7 +73,7 @@ static BOOL in_chained_smb(void)
return (chain_size != 0);
}
-static void received_unlock_msg(int msg_type, struct process_id src,
+static void received_unlock_msg(int msg_type, struct server_id src,
void *buf, size_t len,
void *private_data);
static void process_blocking_lock_queue(void);
@@ -645,7 +645,7 @@ BOOL blocking_lock_was_deferred(int mid)
Set a flag as an unlock request affects one of our pending locks.
*****************************************************************************/
-static void received_unlock_msg(int msg_type, struct process_id src,
+static void received_unlock_msg(int msg_type, struct server_id src,
void *buf, size_t len,
void *private_data)
{
@@ -807,7 +807,7 @@ static void process_blocking_lock_queue(void)
#define MSG_BLOCKING_LOCK_CANCEL_SIZE (sizeof(blocking_lock_record *) + sizeof(NTSTATUS))
static void process_blocking_lock_cancel_message(int msg_type,
- struct process_id src,
+ struct server_id src,
void *buf, size_t len,
void *private_data)
{
diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index a15684a35b..d126bd39e6 100644
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -319,7 +319,7 @@ the message contains just a share name and all instances of that
share are unmounted
the special sharename '*' forces unmount of all shares
****************************************************************************/
-void msg_force_tdis(int msg_type, struct process_id pid, void *buf, size_t len,
+void msg_force_tdis(int msg_type, struct server_id pid, void *buf, size_t len,
void *private_data)
{
connection_struct *conn, *next;
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index 9f23db6671..940ff8aae9 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -677,7 +677,7 @@ void notify_trigger(struct notify_context *notify,
DEBUG(10, ("Deleting notify entries for "
"process %s because it's gone\n",
- procid_str_static(&e->server.id)));
+ procid_str_static(&e->server)));
notify_remove_all(notify, &server);
goto again;
}
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index f959f00b10..e891209d2b 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2247,7 +2247,7 @@ NTSTATUS open_file_stat(connection_struct *conn, const char *fname,
smbd process.
****************************************************************************/
-void msg_file_was_renamed(int msg_type, struct process_id src,
+void msg_file_was_renamed(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
files_struct *fsp;
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 26ee52b797..8a84331810 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -391,7 +391,7 @@ static void add_oplock_timeout_handler(files_struct *fsp)
the client for LEVEL2.
*******************************************************************/
-static void process_oplock_async_level2_break_message(int msg_type, struct process_id src,
+static void process_oplock_async_level2_break_message(int msg_type, struct server_id src,
void *buf, size_t len,
void *private_data)
{
@@ -478,7 +478,7 @@ static void process_oplock_async_level2_break_message(int msg_type, struct proce
This handles the generic oplock break message from another smbd.
*******************************************************************/
-static void process_oplock_break_message(int msg_type, struct process_id src,
+static void process_oplock_break_message(int msg_type, struct server_id src,
void *buf, size_t len,
void *private_data)
{
@@ -587,7 +587,7 @@ static void process_oplock_break_message(int msg_type, struct process_id src,
This handles the kernel oplock break message.
*******************************************************************/
-static void process_kernel_oplock_break(int msg_type, struct process_id src,
+static void process_kernel_oplock_break(int msg_type, struct server_id src,
void *buf, size_t len,
void *private_data)
{
@@ -679,7 +679,7 @@ void reply_to_oplock_break_requests(files_struct *fsp)
return;
}
-static void process_oplock_break_response(int msg_type, struct process_id src,
+static void process_oplock_break_response(int msg_type, struct server_id src,
void *buf, size_t len,
void *private_data)
{
@@ -707,7 +707,7 @@ static void process_oplock_break_response(int msg_type, struct process_id src,
schedule_deferred_open_smb_message(msg.op_mid);
}
-static void process_open_retry_message(int msg_type, struct process_id src,
+static void process_open_retry_message(int msg_type, struct server_id src,
void *buf, size_t len,
void *private_data)
{
diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c
index bec2f19f86..aba2fe69c5 100644
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -37,7 +37,7 @@
#define PIPEDB_KEY_FORMAT "PIPE/%s/%u/%d"
struct pipe_dbrec {
- struct process_id pid;
+ struct server_id pid;
int pnum;
uid_t uid;
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 3422290a90..1020ad3aca 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -87,7 +87,7 @@ struct messaging_context *smbd_messaging_context(void)
What to do when smb.conf is updated.
********************************************************************/
-static void smb_conf_updated(int msg_type, struct process_id src,
+static void smb_conf_updated(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
DEBUG(10,("smb_conf_updated: Got message saying smb.conf was updated. Reloading.\n"));
@@ -99,7 +99,7 @@ static void smb_conf_updated(int msg_type, struct process_id src,
Delete a statcache entry.
********************************************************************/
-static void smb_stat_cache_delete(int msg_type, struct process_id src,
+static void smb_stat_cache_delete(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
const char *name = (const char *)buf;
@@ -150,7 +150,7 @@ static void killkids(void)
somewhere else.
****************************************************************************/
-static void msg_sam_sync(int UNUSED(msg_type), struct process_id UNUSED(pid),
+static void msg_sam_sync(int UNUSED(msg_type), struct server_id UNUSED(pid),
void *UNUSED(buf), size_t UNUSED(len),
void *private_data)
{
@@ -162,7 +162,7 @@ static void msg_sam_sync(int UNUSED(msg_type), struct process_id UNUSED(pid),
somewhere else.
****************************************************************************/
-static void msg_sam_repl(int msg_type, struct process_id pid,
+static void msg_sam_repl(int msg_type, struct server_id pid,
void *buf, size_t len, void *private_data)
{
uint32 low_serial;
@@ -196,7 +196,7 @@ static BOOL open_sockets_inetd(void)
return True;
}
-static void msg_exit_server(int msg_type, struct process_id src,
+static void msg_exit_server(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
DEBUG(3, ("got a SHUTDOWN message\n"));
@@ -204,7 +204,7 @@ static void msg_exit_server(int msg_type, struct process_id src,
}
#ifdef DEVELOPER
-static void msg_inject_fault(int msg_type, struct process_id src,
+static void msg_inject_fault(int msg_type, struct server_id src,
void *buf, size_t len, void *private_data)
{
int sig;
@@ -921,7 +921,7 @@ extern void build_options(BOOL screen);
}
if (profile_level != NULL) {
int pl = atoi(profile_level);
- struct process_id src;
+ struct server_id src;
DEBUG(1, ("setting profiling level: %s\n",profile_level));
src.pid = getpid();
generated by cgit (git 2.34.1) at 2025-01-01 02:15:53 +0000