ITS#5563

diff --git a/CHANGES b/CHANGES
index 01cfdb45ba5f798b24265404d721ec8bfaa5dbf0..2e99b9324930b60be8986879b1c7fdb34287cce9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.11 Engineering
        Added libldap assertion control (ITS#5560)
+       Fixed slapd crash with no listeners (ITS#5563)
        Fixed slapd sets memory leak (ITS#5557)
        Fixed slapd-sock, back-shell buffer count (ITS#5558)
        Added slapo-nssov contrib module

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 0cc2707c1d2df22161f1bc3cda376ae3a37976a6..450cbbfc8ef84c7bf6f6e21b141151fa7a354c58 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -1676,7 +1676,7 @@ sortval_reject:
                                                Listener **l = slapd_get_listeners();
                                                int i;
 
-                                               for ( i=0; l[i]; i++ ) {
+                                               for ( i=0; l && l[i]; i++ ) {
                                                        LDAPURLDesc *lu2;
                                                        int isMe = 0;
                                                        ldap_url_parse( l[i]->sl_url.bv_val, &lu2 );