diff options
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/include/serverid.h | 2 | ||||
| -rw-r--r-- | source3/lib/serverid.c | 21 |
3 files changed, 1 insertions, 24 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 9af72a190b..00dbab84ad 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -454,7 +454,7 @@ void set_my_unique_id(uint64_t unique_id); struct server_id pid_to_procid(pid_t pid); struct server_id procid_self(void); struct server_id *new_server_id_task(TALLOC_CTX *mem_ctx); -bool serverid_equal(const struct server_id *p1, const struct server_id *p2); +#define serverid_equal(p1, p2) server_id_equal(p1,p2) bool procid_is_me(const struct server_id *pid); struct server_id interpret_pid(const char *pid_string); char *procid_str_static(const struct server_id *pid); diff --git a/source3/include/serverid.h b/source3/include/serverid.h index ed8d17f95a..1833f53d55 100644 --- a/source3/include/serverid.h +++ b/source3/include/serverid.h @@ -75,6 +75,4 @@ bool serverid_parent_init(TALLOC_CTX *mem_ctx); */ uint64_t serverid_get_random_unique_id(void); -bool serverid_equal(const struct server_id *p1, const struct server_id *p2); - #endif diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c index 3068d77a84..3c5402e3f3 100644 --- a/source3/lib/serverid.c +++ b/source3/lib/serverid.c @@ -458,24 +458,3 @@ uint64_t serverid_get_random_unique_id(void) return unique_id; } - -bool serverid_equal(const struct server_id *p1, const struct server_id *p2) -{ - if (p1->pid != p2->pid) { - return false; - } - - if (p1->task_id != p2->task_id) { - return false; - } - - if (p1->vnn != p2->vnn) { - return false; - } - - if (p1->unique_id != p2->unique_id) { - return false; - } - - return true; -} |