r23779: Change from v2 or later to v3 or later.

[tprouty/samba.git] / source3 / lib / module.c

diff --git a/source3/lib/module.c b/source3/lib/module.c
index 5ad64858064ab0c996a8bff593b6e89104a6d65f..eaf96babb95154ea87c653e0210e62f0b3560dfd 100644 (file)
--- a/source3/lib/module.c
+++ b/source3/lib/module.c
@@ -2,11 +2,12 @@
    Unix SMB/CIFS implementation.
    module loading system
 
-   Copyright (C) Jelmer Vernooij 2002
+   Copyright (C) Jelmer Vernooij 2002-2003
+   Copyright (C) Stefan (metze) Metzmacher 2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -22,11 +23,16 @@
 #include "includes.h"
 
 #ifdef HAVE_DLOPEN
-NTSTATUS smb_load_module(const char *module_name)
+
+/* Load a dynamic module.  Only log a level 0 error if we are not checking 
+   for the existence of a module (probling). */
+
+static NTSTATUS do_smb_load_module(const char *module_name, BOOL is_probe)
 {
        void *handle;
        init_module_function *init;
-       NTSTATUS nt_status;
+       NTSTATUS status;
+       const char *error;
 
        /* Always try to use LAZY symbol resolving; if the plugin has 
         * backwards compatibility, there might be symbols in the 
@@ -34,23 +40,41 @@ NTSTATUS smb_load_module(const char *module_name)
         */
        handle = sys_dlopen(module_name, RTLD_LAZY);
 
+       /* This call should reset any possible non-fatal errors that 
+          occured since last call to dl* functions */
+       error = sys_dlerror();
+
        if(!handle) {
-               DEBUG(0, ("Error loading module '%s': %s\n", module_name, sys_dlerror()));
+               int level = is_probe ? 3 : 0;
+               DEBUG(level, ("Error loading module '%s': %s\n", module_name, error ? error : ""));
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       init = sys_dlsym(handle, "init_module");
+       init = (init_module_function *)sys_dlsym(handle, "init_module");
 
-       if(!init) {
-               DEBUG(0, ("Error trying to resolve symbol 'init_module' in %s: %s\n", module_name, sys_dlerror()));
+       /* we must check sys_dlerror() to determine if it worked, because
+           sys_dlsym() can validly return NULL */
+       error = sys_dlerror();
+       if (error) {
+               DEBUG(0, ("Error trying to resolve symbol 'init_module' in %s: %s\n", 
+                         module_name, error));
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       nt_status = init();
-
        DEBUG(2, ("Module '%s' loaded\n", module_name));
 
-       return nt_status;
+       status = init();
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("Module '%s' initialization failed: %s\n",
+                           module_name, get_friendly_nt_error_msg(status)));
+       }
+
+       return status;
+}
+
+NTSTATUS smb_load_module(const char *module_name)
+{
+       return do_smb_load_module(module_name, False);
 }
 
 /* Load all modules in list and return number of 
@@ -71,18 +95,58 @@ int smb_load_modules(const char **modules)
        return success;
 }
 
+NTSTATUS smb_probe_module(const char *subsystem, const char *module)
+{
+       pstring full_path;
+       
+       /* Check for absolute path */
+
+       /* if we make any 'samba multibyte string' 
+          calls here, we break 
+          for loading string modules */
+
+       DEBUG(5, ("Probing module '%s'\n", module));
+
+       if (module[0] == '/')
+               return do_smb_load_module(module, True);
+       
+       pstrcpy(full_path, lib_path(subsystem));
+       pstrcat(full_path, "/");
+       pstrcat(full_path, module);
+       pstrcat(full_path, ".");
+       pstrcat(full_path, shlib_ext());
+
+       DEBUG(5, ("Probing module '%s': Trying to load from %s\n", module, full_path));
+       
+       return do_smb_load_module(full_path, True);
+}
+
 #else /* HAVE_DLOPEN */
 
 NTSTATUS smb_load_module(const char *module_name)
 {
-       DEBUG(0,("This samba executable has not been build with plugin support"));
+       DEBUG(0,("This samba executable has not been built with plugin support\n"));
        return NT_STATUS_NOT_SUPPORTED;
 }
 
 int smb_load_modules(const char **modules)
 {
-       DEBUG(0,("This samba executable has not been build with plugin support"));
+       DEBUG(0,("This samba executable has not been built with plugin support\n"));
        return -1;
 }
 
+NTSTATUS smb_probe_module(const char *subsystem, const char *module)
+{
+       DEBUG(0,("This samba executable has not been built with plugin support, not probing\n")); 
+       return NT_STATUS_NOT_SUPPORTED;
+}
+
 #endif /* HAVE_DLOPEN */
+
+void init_modules(void)
+{
+       /* FIXME: This can cause undefined symbol errors :
+        *  smb_register_vfs() isn't available in nmbd, for example */
+       if(lp_preload_modules()) 
+               smb_load_modules(lp_preload_modules());
+}