Changes from HEAD for beta

[openldap] / servers / slapd / slapi / plugin.c

diff --git a/servers/slapd/slapi/plugin.c b/servers/slapd/slapi/plugin.c
index 5deb32614713af15847a8a8d73f738107918cdeb..b4e99b988446e07952270cf630d1a04d76bff67c 100644 (file)
--- a/servers/slapd/slapi/plugin.c
+++ b/servers/slapd/slapi/plugin.c
@@ -637,8 +637,11 @@ doPluginFNs(
                 * failure (confirmed with SLAPI specification).
                 */
                if ( !SLAPI_PLUGIN_IS_POST_FN( funcType ) && rc != 0 ) {
-                       /* make sure errors are negative */
-                       if ( rc > 0 ) rc = 0 - rc;
+                       /*
+                        * Plugins generally return negative error codes
+                        * to indicate failure, although in the case of
+                        * bind plugins they may return SLAPI_BIND_xxx
+                        */
                        break;
                }
        }
@@ -744,6 +747,10 @@ slapi_init(void)
                return -1;
        }
 
+       if ( slapi_x_init_object_extensions() != 0 ) {
+               return -1;
+       }
+
        return 0;
 }