summaryrefslogtreecommitdiff
path: root/source3/rpc_server
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-05-07 15:31:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:21:54 -0500
commit76ce309234adbe0a6a56b849a91714cab148c4a7 (patch)
tree0fe73b35a0c08fbc9b347dfeb23ce89f0bc08885 /source3/rpc_server
parent71921605995fa95d84301534760a6bc2db3fa74b (diff)
downloadsamba-76ce309234adbe0a6a56b849a91714cab148c4a7.tar.gz
samba-76ce309234adbe0a6a56b849a91714cab148c4a7.tar.bz2
samba-76ce309234adbe0a6a56b849a91714cab148c4a7.zip
r22751: Next step for the cluster merge: sessionid.tdb should contain a 'struct
server_id' instead of a 'uint32 pid' (This used to be commit be7bac55c37676a8137c59a22dfb2e4c4821ac21)
Diffstat (limited to 'source3/rpc_server')
-rw-r--r--source3/rpc_server/srv_srvsvc_nt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index bdd8f68d51..2365f7ece3 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -43,7 +43,7 @@ struct file_enum_count {
};
struct sess_file_count {
- pid_t pid;
+ struct server_id pid;
uid_t uid;
int count;
};
@@ -809,7 +809,7 @@ static void sess_file_fn( const struct share_mode_entry *e,
{
struct sess_file_count *sess = (struct sess_file_count *)private_data;
- if ( (procid_to_pid(&e->pid) == sess->pid) && (sess->uid == e->uid) ) {
+ if ( procid_equal(&e->pid, &sess->pid) && (sess->uid == e->uid) ) {
sess->count++;
}
@@ -819,7 +819,7 @@ static void sess_file_fn( const struct share_mode_entry *e,
/*******************************************************************
********************************************************************/
-static int net_count_files( uid_t uid, pid_t pid )
+static int net_count_files( uid_t uid, struct server_id pid )
{
struct sess_file_count s_file_cnt;
@@ -1237,7 +1237,7 @@ WERROR _srvsvc_NetSessDel(pipes_struct *p, struct srvsvc_NetSessDel *r)
if ((strequal(session_list[snum].username, r->in.user) || r->in.user[0] == '\0' ) &&
strequal(session_list[snum].remote_machine, machine)) {
- if (NT_STATUS_IS_OK(message_send_pid(pid_to_procid(session_list[snum].pid), MSG_SHUTDOWN, NULL, 0, False)))
+ if (NT_STATUS_IS_OK(message_send_pid(session_list[snum].pid, MSG_SHUTDOWN, NULL, 0, False)))
status = WERR_OK;
}
}