From: Michael Adam <obnox@samba.org>
Date: Tue, 15 Apr 2008 11:50:27 +0000 (+0200)
Subject: libsmbconf: add handling of NULL strings to smbconf_find_in_array().
X-Git-Tag: samba-3.3.0pre1~2651
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a5923bafe9b543d50dca06d251186948baeac8cc;p=thirdparty%2Fsamba.git

libsmbconf: add handling of NULL strings to smbconf_find_in_array().

Michael
---

diff --git a/source/lib/smbconf/smbconf_util.c b/source/lib/smbconf/smbconf_util.c
index 20bd51a62bd..b2e253dd26c 100644
--- a/source/lib/smbconf/smbconf_util.c
+++ b/source/lib/smbconf/smbconf_util.c
@@ -111,12 +111,14 @@ bool smbconf_find_in_array(const char *string, char **list,
 {
 	uint32_t i;
 
-	if ((string == NULL) || (list == NULL)) {
+	if (list == NULL) {
 		return false;
 	}
 
 	for (i = 0; i < num_entries; i++) {
-		if (strequal(string, list[i])) {
+		if (((string == NULL) && (list[i] == NULL)) ||
+		    strequal(string, list[i]))
+		{
 			if (entry != NULL) {
 				*entry = i;
 			}