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

lib: Use CTDB_CONTROL_CHECK_PID_SRVID

Browse Source 
Also check the unique ID for remote server ids, just like we do for
local server ids

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13042
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Tue Sep 26 13:47:31 CEST 2017 on sn-devel-144
This commit is contained in:
Volker Lendecke 2017-08-29 13:31:07 +02:00
parent f059585fe6
commit 61de349673
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source3/lib/ctdbd_conn.c
View File

@ -784,12 +784,27 @@ static int ctdbd_control(struct ctdbd_connection *conn,
bool ctdbd_process_exists(struct ctdbd_connection *conn, uint32_t vnn,
pid_t pid, uint64_t unique_id)
{
uint8_t buf[sizeof(pid)+sizeof(unique_id)];
int32_t cstatus = 0;
int ret;
ret = ctdbd_control(conn, vnn, CTDB_CONTROL_PROCESS_EXISTS, 0, 0,
(TDB_DATA) { .dptr = (uint8_t *)&pid,
.dsize = sizeof(pid) },
if (unique_id == SERVERID_UNIQUE_ID_NOT_TO_VERIFY) {
ret = ctdbd_control(conn, vnn, CTDB_CONTROL_PROCESS_EXISTS,
0, 0,
(TDB_DATA) { .dptr = (uint8_t *)&pid,
.dsize = sizeof(pid) },
NULL, NULL, &cstatus);
if (ret != 0) {
return false;
}
return (cstatus == 0);
}
memcpy(buf, &pid, sizeof(pid));
memcpy(buf+sizeof(pid), &unique_id, sizeof(unique_id));
ret = ctdbd_control(conn, vnn, CTDB_CONTROL_CHECK_PID_SRVID, 0, 0,
(TDB_DATA) { .dptr = buf, .dsize = sizeof(buf) },
NULL, NULL, &cstatus);
if (ret != 0) {
return false;