X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconfig.c;h=a4e566b49f19d97d44b28c469304e988c39ee0f4;hb=56bbc0b4860c716b4a21f98c2f0eba9a7a70b765;hp=47b081a2860b1d172716fb1f8f403ef79f7824fb;hpb=0743e963cac4aca63ea40e837fb3e7f59cbec04d;p=openldap

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 47b081a286..a4e566b49f 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -654,19 +654,32 @@ read_config( char *fname )
 			ldap_srvtab = ch_strdup( cargv[1] );
 
 #ifdef SLAPD_MODULES
-                } else if (strcasecmp( cargv[0], "loadmodule") == 0 ) {
+                } else if (strcasecmp( cargv[0], "moduleload") == 0 ) {
                    if ( cargc < 2 ) {
                       Debug( LDAP_DEBUG_ANY,
-                             "%s: line %d: missing filename in \"loadmodule <filename>\" line\n",
+                             "%s: line %d: missing filename in \"moduleload <filename>\" line\n",
                              fname, lineno, 0 );
                       exit( EXIT_FAILURE );
                    }
-                   if (load_module(cargv[1], cargc - 2, (cargc > 2) ? cargv + 2 : NULL)) {
+                   if (module_load(cargv[1], cargc - 2, (cargc > 2) ? cargv + 2 : NULL)) {
                       Debug( LDAP_DEBUG_ANY,
                              "%s: line %d: failed to load or initialize module %s\n",
                              fname, lineno, cargv[1]);
                       exit( EXIT_FAILURE );
                    }
+                } else if (strcasecmp( cargv[0], "modulepath") == 0 ) {
+                   if ( cargc != 2 ) {
+                      Debug( LDAP_DEBUG_ANY,
+                             "%s: line %d: missing path in \"modulepath <path>\" line\n",
+                             fname, lineno, 0 );
+                      exit( EXIT_FAILURE );
+                   }
+                   if (module_path( cargv[1] )) {
+                      Debug( LDAP_DEBUG_ANY,
+                             "%s: line %d: failed to set module search path to %s\n",
+                             fname, lineno, cargv[1]);
+                      exit( EXIT_FAILURE );
+                   }
 		   
 #endif /*SLAPD_MODULES*/