This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to...

[metze/samba/wip.git] / source3 / auth / auth_builtin.c

diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c
index 5ce7075ab9f9379a35a6bdc23242d711ad055f11..3b0b84b5256711852bf97ce7f74f77d43c598ae4 100644 (file)
--- a/source3/auth/auth_builtin.c
+++ b/source3/auth/auth_builtin.c
@@ -41,23 +41,19 @@ static NTSTATUS check_guest_security(const struct auth_context *auth_context,
        NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
 
        if (!(user_info->internal_username.str 
-             && *user_info->internal_username.str)) { 
-               if (make_server_info_guest(server_info)) {
-                       nt_status = NT_STATUS_OK;
-               } else {
-                       nt_status = NT_STATUS_NO_SUCH_USER;
-               }
+             && *user_info->internal_username.str)) {
+               nt_status = make_server_info_guest(server_info);
        }
 
        return nt_status;
 }
 
 /* Guest modules initialisation */
+
 NTSTATUS auth_init_guest(struct auth_context *auth_context, const char *options, auth_methods **auth_method) 
 {
-       if (!make_auth_methods(auth_context, auth_method)) {
+       if (!make_auth_methods(auth_context, auth_method))
                return NT_STATUS_NO_MEMORY;
-       }
 
        (*auth_method)->auth = check_guest_security;
        (*auth_method)->name = "guest";
@@ -96,19 +92,19 @@ static NTSTATUS check_name_to_ntstatus_security(const struct auth_context *auth_
        strlower(user);
        error_num = strtoul(user, NULL, 16);
        
-       DEBUG(5,("Error for user %s was %lx\n", user, error_num));
+       DEBUG(5,("check_name_to_ntstatus_security: Error for user %s was %lx\n", user, error_num));
 
        nt_status = NT_STATUS(error_num);
        
        return nt_status;
 }
 
-/** Module initailisation function */
+/** Module initialisation function */
+
 NTSTATUS auth_init_name_to_ntstatus(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
 {
-       if (!make_auth_methods(auth_context, auth_method)) {
+       if (!make_auth_methods(auth_context, auth_method))
                return NT_STATUS_NO_MEMORY;
-       }
 
        (*auth_method)->auth = check_name_to_ntstatus_security;
        (*auth_method)->name = "name_to_ntstatus";
@@ -116,7 +112,7 @@ NTSTATUS auth_init_name_to_ntstatus(struct auth_context *auth_context, const cha
 }
 
 /** 
- * Return a 'fixed' challenge instead of a varaible one.
+ * Return a 'fixed' challenge instead of a variable one.
  *
  * The idea of this function is to make packet snifs consistant
  * with a fixed challenge, so as to aid debugging.
@@ -153,11 +149,11 @@ static DATA_BLOB auth_get_fixed_challenge(const struct auth_context *auth_contex
 
 
 /** Module initailisation function */
+
 NTSTATUS auth_init_fixed_challenge(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
 {
-       if (!make_auth_methods(auth_context, auth_method)) {
+       if (!make_auth_methods(auth_context, auth_method))
                return NT_STATUS_NO_MEMORY;
-       }
 
        (*auth_method)->auth = check_fixed_challenge_security;
        (*auth_method)->get_chal = auth_get_fixed_challenge;
@@ -172,6 +168,7 @@ NTSTATUS auth_init_fixed_challenge(struct auth_context *auth_context, const char
  **/
 
 /* Plugin modules initialisation */
+
 NTSTATUS auth_init_plugin(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
 {
        void * dl_handle;
@@ -179,7 +176,7 @@ NTSTATUS auth_init_plugin(struct auth_context *auth_context, const char *param,
        auth_init_function plugin_init;
 
        if (param == NULL) {
-               DEBUG(0, ("The plugin module needs an argument!\n"));
+               DEBUG(0, ("auth_init_plugin: The plugin module needs an argument!\n"));
                return NT_STATUS_UNSUCCESSFUL;
        }
 
@@ -193,21 +190,21 @@ NTSTATUS auth_init_plugin(struct auth_context *auth_context, const char *param,
 
        trim_string(plugin_name, " ", " ");
 
-       DEBUG(5, ("Trying to load auth plugin %s\n", plugin_name));
-       dl_handle = sys_dlopen(plugin_name, RTLD_NOW | RTLD_GLOBAL );
+       DEBUG(5, ("auth_init_plugin: Trying to load auth plugin %s\n", plugin_name));
+       dl_handle = sys_dlopen(plugin_name, RTLD_NOW );
        if (!dl_handle) {
-               DEBUG(0, ("Failed to load auth plugin %s using sys_dlopen (%s)\n", plugin_name, sys_dlerror()));
+               DEBUG(0, ("auth_init_plugin: Failed to load auth plugin %s using sys_dlopen (%s)\n",
+                                       plugin_name, sys_dlerror()));
                return NT_STATUS_UNSUCCESSFUL;
        }
     
        plugin_init = sys_dlsym(dl_handle, "auth_init");
        if (!plugin_init){
-               DEBUG(0, ("Failed to find function 'pdb_init' using sys_dlsym in sam plugin %s (%s)\n", plugin_name, sys_dlerror()));       
+               DEBUG(0, ("Failed to find function 'auth_init' using sys_dlsym in sam plugin %s (%s)\n",
+                                       plugin_name, sys_dlerror()));       
                return NT_STATUS_UNSUCCESSFUL;
        }
 
        DEBUG(5, ("Starting sam plugin %s with paramater %s\n", plugin_name, plugin_param?plugin_param:"(null)"));
        return plugin_init(auth_context, plugin_param, auth_method);
 }
-
-