diff options
| author | Volker Lendecke <vl@samba.org> | 2012-02-15 11:22:45 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-02-15 21:10:22 +0100 |
| commit | dd5868d41eeaa304a471822d7783526d9f4c37f5 (patch) | |
| tree | 244604395cecaf711417fa641e654f126c225564 /source3/lib/ctdbd_conn.c | |
| parent | a6bd7f3d574998419cac01b1f7b4fa2e1067bb7c (diff) | |
| download | samba-dd5868d41eeaa304a471822d7783526d9f4c37f5.tar.gz samba-dd5868d41eeaa304a471822d7783526d9f4c37f5.tar.bz2 samba-dd5868d41eeaa304a471822d7783526d9f4c37f5.zip | |
s3: Add SERVERID_UNIQUE_ID_NOT_TO_VERIFY, bug 8760
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Feb 15 21:10:22 CET 2012 on sn-devel-104
Diffstat (limited to 'source3/lib/ctdbd_conn.c')
| -rw-r--r-- | source3/lib/ctdbd_conn.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 12b736deb3..9c73002078 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -20,6 +20,7 @@ #include "includes.h" #include "util_tdb.h" +#include "serverid.h" #ifdef CLUSTER_SUPPORT @@ -1228,8 +1229,14 @@ bool ctdb_serverids_exist(struct ctdbd_connection *conn, } for (i=0; i<vnn->num_srvids; i++) { - results[vnn->pid_indexes[i]] = - ((reply->data[i/8] & (1<<(i%8))) != 0); + int idx = vnn->pid_indexes[i]; + + if (pids[i].unique_id == + SERVERID_UNIQUE_ID_NOT_TO_VERIFY) { + results[idx] = true; + continue; + } + results[idx] = ((reply->data[i/8] & (1<<(i%8))) != 0); } TALLOC_FREE(reply); |