summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Natano <natano@cvs.openbsd.org>2017-02-28 10:30:28 +0000
committerMartin Natano <natano@cvs.openbsd.org>2017-02-28 10:30:28 +0000
commitceab8c1cc132068b6da9b2aed2fbdcc9628f3ac4 (patch)
tree6169335dea943a5c1c01bc96a0cfa98eeb616505
parent061a0769491b51d9f436bf85086a22deb7d83bee (diff)
Replace the binaryEqual() function with std memcmp().
ok matthieu
-rw-r--r--app/xenodm/xenodm/auth.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/app/xenodm/xenodm/auth.c b/app/xenodm/xenodm/auth.c
index f879205fe..d5740479f 100644
--- a/app/xenodm/xenodm/auth.c
+++ b/app/xenodm/xenodm/auth.c
@@ -47,6 +47,7 @@ from The Open Group.
#include <errno.h>
#include <pwd.h>
+#include <string.h>
#include <sys/ioctl.h>
@@ -487,15 +488,6 @@ openFiles (char *name, char *new_name, size_t len, FILE **oldp, FILE **newp)
return 1;
}
-static int
-binaryEqual (char *a, char *b, unsigned short len)
-{
- while (len-- > 0)
- if (*a++ != *b++)
- return FALSE;
- return TRUE;
-}
-
static void
dumpBytes (unsigned short len, char *data)
{
@@ -610,11 +602,11 @@ checkEntry (Xauth *auth)
for (a = addrs; a; a = a->next) {
if (a->family == auth->family &&
a->address_length == auth->address_length &&
- binaryEqual (a->address, auth->address, auth->address_length) &&
+ !memcmp (a->address, auth->address, auth->address_length) &&
a->number_length == auth->number_length &&
- binaryEqual (a->number, auth->number, auth->number_length) &&
+ !memcmp (a->number, auth->number, auth->number_length) &&
a->name_length == auth->name_length &&
- binaryEqual (a->name, auth->name, auth->name_length))
+ !memcmp (a->name, auth->name, auth->name_length))
{
return 1;
}