diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h
index be88e8e300d..13fd46977a0 100644
--- a/source3/include/libsmb_internal.h
+++ b/source3/include/libsmb_internal.h
@@ -430,8 +430,7 @@ SMBC_ftruncate_ctx(SMBCCTX *context,
 
 
 /* Functions in libsmb_misc.c */
-int
-SMBC_dlist_contains(SMBCFILE * list, SMBCFILE *p);
+bool SMBC_dlist_contains(SMBCFILE * list, SMBCFILE *p);
 
 int
 SMBC_errno(SMBCCTX *context,
diff --git a/source3/libsmb/libsmb_misc.c b/source3/libsmb/libsmb_misc.c
index 1d874c74cd8..28e2ca842cf 100644
--- a/source3/libsmb/libsmb_misc.c
+++ b/source3/libsmb/libsmb_misc.c
@@ -31,15 +31,18 @@
 /*
  * check if an element is part of the list.
  */
-int
-SMBC_dlist_contains(SMBCFILE * list, SMBCFILE *p)
+bool SMBC_dlist_contains(SMBCFILE * list, SMBCFILE *p)
 {
-	if (!p || !list) return False;
+	if ((p == NULL) || (list == NULL)) {
+		return false;
+	}
 	do {
-		if (p == list) return True;
+		if (p == list) {
+			return true;
+		}
 		list = list->next;
-	} while (list);
-	return False;
+	} while (list != NULL);
+	return false;
 }