diff options
| author | Michael Adam <obnox@samba.org> | 2012-06-16 00:30:55 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-06-21 08:27:32 +0200 |
| commit | b240406651b6397df912c78408e1de0f36334773 (patch) | |
| tree | 741affd5540c14ded6c28edd2387c9aca313219f /source3 | |
| parent | 73b200064fea77037f15cceeda303469b3e78624 (diff) | |
| download | samba-b240406651b6397df912c78408e1de0f36334773.tar.gz samba-b240406651b6397df912c78408e1de0f36334773.tar.bz2 samba-b240406651b6397df912c78408e1de0f36334773.zip | |
s3:move serverid_equal() to serverid.c
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/serverid.h | 2 | ||||
| -rw-r--r-- | source3/lib/serverid.c | 21 | ||||
| -rw-r--r-- | source3/lib/util.c | 21 |
3 files changed, 23 insertions, 21 deletions
diff --git a/source3/include/serverid.h b/source3/include/serverid.h index 1833f53d55..ed8d17f95a 100644 --- a/source3/include/serverid.h +++ b/source3/include/serverid.h @@ -75,4 +75,6 @@ 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 48d5b4251a..0033d60833 100644 --- a/source3/lib/serverid.c +++ b/source3/lib/serverid.c @@ -453,3 +453,24 @@ 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; +} diff --git a/source3/lib/util.c b/source3/lib/util.c index 653fff5c64..f1b815878d 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -2058,27 +2058,6 @@ struct server_id *new_server_id_task(TALLOC_CTX *mem_ctx) return server_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; -} - bool procid_is_me(const struct server_id *pid) { if (pid->pid != getpid()) |