diff mbox

[7/9] libnsdb: Remove dead code from nsdb_new_get_ncedn_s()

Message ID 20140627184311.52216.56745.stgit@seurat.1015granger.net
State Accepted
Headers show

Commit Message

Chuck Lever June 27, 2014, 6:43 p.m. UTC 
Fixes: ea9cadee (libnsdb: simplify NCE discovery)
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 src/libnsdb/fileserver.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
diff mbox

Patch

diff --git a/src/libnsdb/fileserver.c b/src/libnsdb/fileserver.c
index d217bfea3769..244a30976330 100644
--- a/src/libnsdb/fileserver.c
+++ b/src/libnsdb/fileserver.c
@@ -512,7 +512,6 @@  nsdb_new_get_ncedn_s(nsdb_t host, const char *naming_context, char **dn)
 	LDAPMessage *response, *message;
 	LDAP *ld = host->fn_ldap;
 	FedFsStatus retval;
-	unsigned count;
 	int entries;
 
 	host->fn_ldaperr = nsdb_search_nsdb_all_s(ld, naming_context,
@@ -555,17 +554,11 @@  nsdb_new_get_ncedn_s(nsdb_t host, const char *naming_context, char **dn)
 	}
 
 	retval = FEDFS_OK;
-	for (message = ldap_first_message(ld, response), count = 0;
+	for (message = ldap_first_message(ld, response);
 	     message != NULL && retval == FEDFS_OK;
 	     message = ldap_next_message(ld, message)) {
 		switch (ldap_msgtype(message)) {
 		case LDAP_RES_SEARCH_ENTRY:
-			if (++count > 1) {
-				xlog(D_CALL, "%s: more than one NCE under %s",
-					__func__, naming_context);
-				retval = FEDFS_ERR_NSDB_NONCE;
-				goto out;
-			}
 			retval = nsdb_parse_ncedn(ld, message, dn);
 			if (retval == FEDFS_OK)
 				xlog(D_CALL, "%s: %s contains NCE %s",