NVALUES: fix a couple of value_find_ex() calls

[openldap] / servers / slapd / extended.c

diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 5b39e217074cce7f526cf66420a3c630b002ea4d..f15fadeec40a0260a91ee8354f81edffd5feecfc 100644 (file)
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -108,7 +108,7 @@ do_extended(
        struct berval reqdata = {0, NULL};
        ber_tag_t tag;
        ber_len_t len;
-       struct extop_list *ext;
+       struct extop_list *ext = NULL;
        const char *text;
        BerVarray refs;
        char *rspoid;
@@ -157,16 +157,13 @@ do_extended(
                goto done;
        }
 
-       if( !(ext = find_extop(supp_ext_list, &reqoid))
-#ifdef LDAP_SLAPI
-               && !(funcAddr)
-#endif
-       ) {
 #ifdef LDAP_SLAPI
-               /* Netscape extended operation */
-               getPluginFunc( &reqoid, &funcAddr );
+       getPluginFunc( &reqoid, &funcAddr ); /* NS-SLAPI extended operation */
+       if( !funcAddr && !(ext = find_extop(supp_ext_list, &reqoid )))
+#else
+       if( !(ext = find_extop(supp_ext_list, &reqoid )))
 #endif
-
+       {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, ERR, 
                        "do_extended: conn %d  unsupported operation \"%s\"\n",