Move some libgpo files to root.

[jra/samba/.git] / source3 / include / auth.h

diff --git a/source3/include/auth.h b/source3/include/auth.h
index 465892905a65e1f4068f9746f1d60eba59f6c098..7d778b92d0c1b40f2026542b3b4e1b10b4e2e4b4 100644 (file)
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -4,20 +4,19 @@
    Unix SMB/CIFS implementation.
    Standardised Authentication types
    Copyright (C) Andrew Bartlett 2001
-   
+
    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/>.
 */
 
 typedef struct auth_usersupplied_info {
@@ -26,49 +25,58 @@ typedef struct auth_usersupplied_info {
        DATA_BLOB lm_interactive_pwd;
        DATA_BLOB nt_interactive_pwd;
        DATA_BLOB plaintext_password;
-       
-       BOOL encrypted;
-       
+
+       bool encrypted;
+
+       bool was_mapped;              /* Did the username map actually match? */
        char *client_domain;          /* domain name string */
        char *domain;                 /* domain name after mapping */
        char *internal_username;      /* username after mapping */
        char *smb_name;               /* username before mapping */
        char *wksta_name;             /* workstation name (netbios calling
                                       * name) unicode string */
-       
+
        uint32 logon_parameters;
 
 } auth_usersupplied_info;
 
 typedef struct auth_serversupplied_info {
-       BOOL guest;
+       bool guest;
 
        DOM_SID *sids;  /* These SIDs are preliminary between
                           check_ntlm_password and the token creation. */
        size_t num_sids;
 
-       uid_t uid;
-       gid_t gid;
-       
-       /* This groups info is needed for when we become_user() for this uid */
-       size_t n_groups;
-       gid_t *groups;
-       
+       struct unix_user_token utok;
+
        /* NT group information taken from the info3 structure */
-       
+
        NT_USER_TOKEN *ptok;
-       
+
        DATA_BLOB user_session_key;
        DATA_BLOB lm_session_key;
 
         char *login_server; /* which server authorized the login? */
-       
+
        struct samu *sam_account;
-       
+
        void *pam_handle;
 
+       /*
+        * This is a token from /etc/passwd and /etc/group
+        */
+       bool nss_token;
+
        char *unix_name;
-       
+
+       /*
+        * For performance reasons we keep an alpha_strcpy-sanitized version
+        * of the username around as long as the global variable current_user
+        * still exists. If we did not do keep this, we'd have to call
+        * alpha_strcpy whenever we do a become_user(), potentially on every
+        * smb request. See set_current_user_info.
+        */
+       char *sanitized_username;
 } auth_serversupplied_info;
 
 struct auth_context {
@@ -77,14 +85,15 @@ struct auth_context {
        /* Who set this up in the first place? */ 
        const char *challenge_set_by; 
 
-       BOOL challenge_may_be_modified;
+       bool challenge_may_be_modified;
 
        struct auth_methods *challenge_set_method; 
        /* What order are the various methods in?   Try to stop it changing under us */ 
        struct auth_methods *auth_method_list;  
 
        TALLOC_CTX *mem_ctx;
-       const uint8 *(*get_ntlm_challenge)(struct auth_context *auth_context);
+       void (*get_ntlm_challenge)(struct auth_context *auth_context,
+                                  uint8_t chal[8]);
        NTSTATUS (*check_ntlm_password)(const struct auth_context *auth_context,
                                        const struct auth_usersupplied_info *user_info, 
                                        struct auth_serversupplied_info **server_info);
@@ -110,15 +119,9 @@ typedef struct auth_methods
        DATA_BLOB (*get_chal)(const struct auth_context *auth_context,
                              void **my_private_data, 
                              TALLOC_CTX *mem_ctx);
-       
+
        /* Used to keep tabs on things like the cli for SMB server authentication */
        void *private_data;
-       
-       /* Function to clean up the above arbitary structure */
-       void (*free_private_data)(void **private_data);
-
-       /* Function to send a keepalive message on the above structure */
-       void (*send_keepalive)(void **private_data);
 
 } auth_methods;