summaryrefslogtreecommitdiff
path: root/source3/smbd
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/smbd
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/smbd')
-rw-r--r--source3/smbd/session.c2
-rw-r--r--source3/smbd/sesssetup.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/session.c b/source3/smbd/session.c
index 30ade8aedf..cd7511430e 100644
--- a/source3/smbd/session.c
+++ b/source3/smbd/session.c
@@ -60,7 +60,7 @@ BOOL session_claim(user_struct *vuser)
struct sockaddr sa;
struct in_addr *client_ip;
struct sessionid sessionid;
- uint32 pid = (uint32)sys_getpid();
+ struct server_id pid = procid_self();
fstring keystr;
char * hostname;
int tdb_store_flag; /* If using utmp, we do an inital 'lock hold' store,
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 7dbf20a189..d6cdf777d8 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -1180,11 +1180,11 @@ static int shutdown_other_smbds(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
struct sessionid *sessionid = (struct sessionid *)dbuf.dptr;
const char *ip = (const char *)p;
- if (!process_exists(pid_to_procid(sessionid->pid))) {
+ if (!process_exists(sessionid->pid)) {
return 0;
}
- if (sessionid->pid == sys_getpid()) {
+ if (procid_is_me(&sessionid->pid)) {
return 0;
}
@@ -1192,7 +1192,7 @@ static int shutdown_other_smbds(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
return 0;
}
- message_send_pid(pid_to_procid(sessionid->pid), MSG_SHUTDOWN,
+ message_send_pid(sessionid->pid, MSG_SHUTDOWN,
NULL, 0, True);
return 0;
}