s3-talloc Change TALLOC_ZERO_P() to talloc_zero()

[nivanova/samba-autobuild/.git] / source3 / auth / auth_builtin.c

diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c
index 5a9b5534ab61b4e80db115f7911d9445420f2149..cfe89495a01a88822b94a99293e610c0a271e304 100644 (file)
--- a/source3/auth/auth_builtin.c
+++ b/source3/auth/auth_builtin.c
@@ -3,23 +3,23 @@
    Generic authentication types
    Copyright (C) Andrew Bartlett         2001-2002
    Copyright (C) Jelmer Vernooij              2002
-   
+
    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,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
@@ -35,14 +35,17 @@
 static NTSTATUS check_guest_security(const struct auth_context *auth_context,
                                     void *my_private_data, 
                                     TALLOC_CTX *mem_ctx,
-                                    const auth_usersupplied_info *user_info, 
-                                    auth_serversupplied_info **server_info)
+                                    const struct auth_usersupplied_info *user_info,
+                                    struct auth_serversupplied_info **server_info)
 {
-       NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
+       /* mark this as 'not for me' */
+       NTSTATUS nt_status = NT_STATUS_NOT_IMPLEMENTED;
+
+       DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name));
 
-       if (!(user_info->internal_username.str 
-             && *user_info->internal_username.str)) {
-               nt_status = make_server_info_guest(server_info);
+       if (!(user_info->mapped.account_name
+             && *user_info->mapped.account_name)) {
+               nt_status = make_server_info_guest(NULL, server_info);
        }
 
        return nt_status;
@@ -52,11 +55,16 @@ static NTSTATUS check_guest_security(const struct auth_context *auth_context,
 
 static NTSTATUS auth_init_guest(struct auth_context *auth_context, const char *options, auth_methods **auth_method) 
 {
-       if (!make_auth_methods(auth_context, auth_method))
+       struct auth_methods *result;
+
+       result = talloc_zero(auth_context, struct auth_methods);
+       if (result == NULL) {
                return NT_STATUS_NO_MEMORY;
+       }
+       result->auth = check_guest_security;
+       result->name = "guest";
 
-       (*auth_method)->auth = check_guest_security;
-       (*auth_method)->name = "guest";
+        *auth_method = result;
        return NT_STATUS_OK;
 }
 
@@ -77,26 +85,29 @@ static NTSTATUS auth_init_guest(struct auth_context *auth_context, const char *o
 static NTSTATUS check_name_to_ntstatus_security(const struct auth_context *auth_context,
                                                void *my_private_data, 
                                                TALLOC_CTX *mem_ctx,
-                                               const auth_usersupplied_info *user_info, 
-                                               auth_serversupplied_info **server_info)
+                                               const struct auth_usersupplied_info *user_info,
+                                               struct auth_serversupplied_info **server_info)
 {
        NTSTATUS nt_status;
        fstring user;
        long error_num;
-       fstrcpy(user, user_info->smb_name.str);
-       
-       if (strncasecmp("NT_STATUS", user, strlen("NT_STATUS")) == 0) {
-               strupper(user);
+
+       DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name));
+
+       fstrcpy(user, user_info->client.account_name);
+
+       if (strnequal("NT_STATUS", user, strlen("NT_STATUS"))) {
+               strupper_m(user);
                return nt_status_string_to_code(user);
        }
 
-       strlower(user);
+       strlower_m(user);
        error_num = strtoul(user, NULL, 16);
-       
+
        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;
 }
 
@@ -104,11 +115,16 @@ static NTSTATUS check_name_to_ntstatus_security(const struct auth_context *auth_
 
 static 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))
+       struct auth_methods *result;
+
+       result = talloc_zero(auth_context, struct auth_methods);
+       if (result == NULL) {
                return NT_STATUS_NO_MEMORY;
+       }
+       result->auth = check_name_to_ntstatus_security;
+       result->name = "name_to_ntstatus";
 
-       (*auth_method)->auth = check_name_to_ntstatus_security;
-       (*auth_method)->name = "name_to_ntstatus";
+        *auth_method = result;
        return NT_STATUS_OK;
 }
 
@@ -130,10 +146,10 @@ static NTSTATUS auth_init_name_to_ntstatus(struct auth_context *auth_context, co
 static NTSTATUS check_fixed_challenge_security(const struct auth_context *auth_context,
                                               void *my_private_data, 
                                               TALLOC_CTX *mem_ctx,
-                                              const auth_usersupplied_info *user_info, 
-                                              auth_serversupplied_info **server_info)
+                                              const struct auth_usersupplied_info *user_info,
+                                              struct auth_serversupplied_info **server_info)
 {
-       return NT_STATUS_UNSUCCESSFUL;
+       return NT_STATUS_NOT_IMPLEMENTED;
 }
 
 /****************************************************************************
@@ -149,16 +165,21 @@ static DATA_BLOB auth_get_fixed_challenge(const struct auth_context *auth_contex
 }
 
 
-/** Module initailisation function */
+/** Module initialisation function */
 
 static 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))
+       struct auth_methods *result;
+
+       result = talloc_zero(auth_context, struct auth_methods);
+       if (result == NULL) {
                return NT_STATUS_NO_MEMORY;
+       }
+       result->auth = check_fixed_challenge_security;
+       result->get_chal = auth_get_fixed_challenge;
+       result->name = "fixed_challenge";
 
-       (*auth_method)->auth = check_fixed_challenge_security;
-       (*auth_method)->get_chal = auth_get_fixed_challenge;
-       (*auth_method)->name = "fixed_challenge";
+       *auth_method = result;
        return NT_STATUS_OK;
 }
 #endif /* DEVELOPER */