From: Volker Lendecke <vl@samba.org>
Date: Sat, 7 Sep 2019 16:56:54 +0000 (+0200)
Subject: lib: Use server_id_cmp() in server_id_equal()
X-Git-Tag: talloc-2.3.1~818
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27b63641828f6f1e7e3c8b97cb34795a75688b8f;p=thirdparty%2Fsamba.git

lib: Use server_id_cmp() in server_id_equal()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/lib/util/server_id.c b/lib/util/server_id.c
index ca998116bf4..e66c9791007 100644
--- a/lib/util/server_id.c
+++ b/lib/util/server_id.c
@@ -49,19 +49,8 @@ int server_id_cmp(const struct server_id *p1, const struct server_id *p2)
 
 bool server_id_equal(const struct server_id *p1, const struct server_id *p2)
 {
-	if (!server_id_same_process(p1, p2)) {
-		return false;
-	}
-
-	if (p1->task_id != p2->task_id) {
-		return false;
-	}
-
-	if (p1->unique_id != p2->unique_id) {
-		return false;
-	}
-
-	return true;
+	int cmp = server_id_cmp(p1, p2);
+	return (cmp == 0);
 }
 
 char *server_id_str_buf(struct server_id id, struct server_id_buf *dst)