sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

lib: Fix pid_to_procid()

Browse Source 
Putting in my_unique_id is just wrong. Now that we have
a cheap way to read everyone's unique ids out of the lockfile,
we can fix it.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2015-10-16 11:36:48 +02:00
parent ad924ab859
commit b9fd6e2484
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/lib/util.c
View File

@ -28,6 +28,7 @@
#include "ctdbd_conn.h"
#include "../lib/util/util_pw.h"
#include "messages.h"
#include "messages_dgm.h"
#include "libcli/security/security.h"
#include "serverid.h"
#include "lib/util/sys_rw.h"
@ -1968,12 +1969,17 @@ void set_my_unique_id(uint64_t unique_id)
struct server_id pid_to_procid(pid_t pid)
{
struct server_id result;
result.pid = pid;
result.task_id = 0;
result.unique_id = my_unique_id;
result.vnn = my_vnn;
return result;
uint64_t unique = 0;
int ret;
ret = messaging_dgm_get_unique(pid, &unique);
if (ret != 0) {
DBG_WARNING("%s: messaging_dgm_get_unique failed: %s\n",
__func__, strerror(ret));
}
return (struct server_id) {
.pid = pid, .unique_id = unique, .vnn = my_vnn };
}
struct server_id procid_self(void)