summaryrefslogtreecommitdiff
path: root/source4/lib/util
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib/util')
-rw-r--r--source4/lib/util/data_blob.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/source4/lib/util/data_blob.c b/source4/lib/util/data_blob.c
index e04bd65331..ca04b70eb2 100644
--- a/source4/lib/util/data_blob.c
+++ b/source4/lib/util/data_blob.c
@@ -130,21 +130,23 @@ _PUBLIC_ void data_blob_clear_free(DATA_BLOB *d)
/**
check if two data blobs are equal
**/
-_PUBLIC_ BOOL data_blob_equal(const DATA_BLOB *d1, const DATA_BLOB *d2)
+_PUBLIC_ int data_blob_cmp(const DATA_BLOB *d1, const DATA_BLOB *d2)
{
- if (d1->length != d2->length) {
- return False;
+ int ret;
+ if (d1->data == NULL && d2->data != NULL) {
+ return -1;
}
- if (d1->data == d2->data) {
- return True;
+ if (d1->data != NULL && d2->data == NULL) {
+ return 1;
}
- if (d1->data == NULL || d2->data == NULL) {
- return False;
+ if (d1->data == d2->data) {
+ return d1->length - d2->length;
}
- if (memcmp(d1->data, d2->data, d1->length) == 0) {
- return True;
+ ret = memcmp(d1->data, d2->data, MIN(d1->length, d2->length));
+ if (ret == 0) {
+ return d1->length - d2->length;
}
- return False;
+ return ret;
}
/**