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

[sfrench/samba-autobuild/.git] / source / lib / module.c

diff --git a/source/lib/module.c b/source/lib/module.c
index 6b0309026bc14bddebfd9101359ed03d8a7d1b97..eaf96babb95154ea87c653e0210e62f0b3560dfd 100644 (file)
--- a/source/lib/module.c
+++ b/source/lib/module.c
@@ -2,11 +2,12 @@
    Unix SMB/CIFS implementation.
    module loading system
 
    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
    
    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,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,


@@ -22,7 +23,11 @@
 #include "includes.h"
 
 #ifdef HAVE_DLOPEN
 #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;
 {
        void *handle;
        init_module_function *init;


@@ -35,28 +40,43 @@ NTSTATUS smb_load_module(const char *module_name)
         */
        handle = sys_dlopen(module_name, RTLD_LAZY);
 
         */
        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) {
        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;
        }
 
                return NT_STATUS_UNSUCCESSFUL;
        }
 

-       init = sys_dlsym(handle, "init_module");
+       init = (init_module_function *)sys_dlsym(handle, "init_module");

 
        /* we must check sys_dlerror() to determine if it worked, because
            sys_dlsym() can validly return NULL */
        error = sys_dlerror();
        if (error) {
 
        /* 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));
+               DEBUG(0, ("Error trying to resolve symbol 'init_module' in %s: %s\n", 
+                         module_name, error));

                return NT_STATUS_UNSUCCESSFUL;
        }
 
                return NT_STATUS_UNSUCCESSFUL;
        }
 

-       status = init();
-

        DEBUG(2, ("Module '%s' loaded\n", module_name));
 
        DEBUG(2, ("Module '%s' loaded\n", module_name));
 

+       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;
 }
 
        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 
  * modules that has been successfully loaded */
 int smb_load_modules(const char **modules)
 /* Load all modules in list and return number of 
  * modules that has been successfully loaded */
 int smb_load_modules(const char **modules)


@@ -84,8 +104,11 @@ NTSTATUS smb_probe_module(const char *subsystem, const char *module)
        /* if we make any 'samba multibyte string' 
           calls here, we break 
           for loading string modules */
        /* 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] == '/')
        if (module[0] == '/')

-               return smb_load_module(module);
+               return do_smb_load_module(module, True);

        
        pstrcpy(full_path, lib_path(subsystem));
        pstrcat(full_path, "/");
        
        pstrcpy(full_path, lib_path(subsystem));
        pstrcat(full_path, "/");


@@ -93,9 +116,9 @@ NTSTATUS smb_probe_module(const char *subsystem, const char *module)
        pstrcat(full_path, ".");
        pstrcat(full_path, shlib_ext());
 
        pstrcat(full_path, ".");
        pstrcat(full_path, shlib_ext());
 

-       DEBUG(5, ("Probing module %s: Trying to load from %s\n", module, full_path));
+       DEBUG(5, ("Probing module '%s': Trying to load from %s\n", module, full_path));

        
        

-       return smb_load_module(full_path);
+       return do_smb_load_module(full_path, True);

 }
 
 #else /* HAVE_DLOPEN */
 }
 
 #else /* HAVE_DLOPEN */


@@ -127,26 +150,3 @@ void init_modules(void)
        if(lp_preload_modules()) 
                smb_load_modules(lp_preload_modules());
 }
        if(lp_preload_modules()) 
                smb_load_modules(lp_preload_modules());
 }

-
-
-/*************************************************************************
- * This functions /path/to/foobar.so -> foobar
- ************************************************************************/
-void module_path_get_name(const char *path, pstring name)
-{
-       char *s;
-
-       /* First, make the path relative */
-       s = strrchr(path, '/');
-       if(s) pstrcpy(name, s+1);
-       else pstrcpy(name, path);
-       
-       if (dyn_SHLIBEXT && *dyn_SHLIBEXT && strlen(dyn_SHLIBEXT) < strlen(name)) {
-               int n = strlen(name) - strlen(dyn_SHLIBEXT);
-               
-               /* Remove extension if necessary */
-               if (name[n-1] == '.' && !strcmp(name+n, dyn_SHLIBEXT)) {
-                       name[n-1] = '\0';
-               }
-       }
-}