From c3f8e6761525db438627971675f5965ab8209d93 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Thu, 5 Mar 2009 09:13:26 +0000
Subject: [PATCH] Tweak prev commit

---
 libraries/libldap/tls_g.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
index 6283db2ad7..5bef8ee1a2 100644
--- a/libraries/libldap/tls_g.c
+++ b/libraries/libldap/tls_g.c
@@ -385,15 +385,17 @@ tlsg_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server )
 				for ( j = 0; j<ncas; j++ ) {
 					if ( gnutls_x509_crt_check_issuer( certs[i-1], cas[j] )) {
 						certs[i] = cas[j];
+						max++;
+						/* If this CA is self-signed, we're done */
 						if ( gnutls_x509_crt_check_issuer( cas[j], cas[j] ))
 							j = ncas;
 						break;
 					}
 				}
+				/* only continue if we found a CA and it was not self-signed */
 				if ( j == ncas )
 					break;
 			}
-			max = i+1;
 		}
 		rc = gnutls_certificate_set_x509_key( ctx->cred, certs, max, key );
 		if ( rc ) return -1;
-- 
2.39.5