Import PROTOS fix from HEAD

diff --git a/CHANGES b/CHANGES
index 92b838441212c716aebedd8fb5031c5c26fe14f9..4f419d915e357208b10a2b7c125d6cba97d65922 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.2.20 Engineering
        Fixed slapd ID to DN mapping when values need DN escaping (ITS#3419)
        Fixed slapd sl_realloc memory overrun (ITS#3420, #3404, #3296)
        Fixed slapd syncrepl bugs (ITS#3423, #3425, #3443, #3448)
+       Fixed slapd bad tag handling
        Fixed back-bdb locks in backend_group (ITS#3263, #3365)
        Fixed back-bdb/back-hdb listing of permissive control (ITS#3453)
        Fixed back-ldap failed connection retry (ITS#3217)

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 550c4e05ccc22460b111169c907a44c31b3b7fab..8e03b7e65c80688794a3618908abacb7c0a1d37f 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1140,8 +1140,11 @@ operations_error:
                num_ops_completed_[SLAP_OP_EXTENDED]++;
                break;
        default:
+               /* this is reachable */
+#if 0
                /* not reachable */
                assert( 0 );
+#endif
        }
 #endif /* SLAPD_MONITOR */
        ldap_pvt_thread_mutex_unlock( &num_ops_mutex );