Removed version number from file header.

[amitay/samba.git] / source3 / rpc_server / srv_pipe.c

diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index e3969f7ea8af45b5b02a52adf5e2772eecaf0dcb..70574b4cdd9c743f9d3069b1085e23f2944109f9 100644 (file)
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -1,6 +1,5 @@
 /* 
- *  Unix SMB/Netbios implementation.
- *  Version 1.9.
+ *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
  *  Copyright (C) Andrew Tridgell              1992-1998
  *  Copyright (C) Luke Kenneth Casson Leighton 1996-1998,
@@ -265,17 +264,17 @@ static BOOL api_pipe_ntlmssp_verify(pipes_struct *p, RPC_AUTH_NTLMSSP_RESP *ntlm
        int nt_pw_len;
        int lm_pw_len;
        fstring user_name;
-       fstring pipe_user_name;
        fstring domain;
        fstring wks;
 
        NTSTATUS nt_status;
 
+       struct auth_context *auth_context = NULL;
        auth_usersupplied_info *user_info = NULL;
        auth_serversupplied_info *server_info = NULL;
 
-       uid_t *puid;
-       uid_t *pgid;
+       uid_t uid;
+       uid_t gid;
 
        DEBUG(5,("api_pipe_ntlmssp_verify: checking user details\n"));
 
@@ -326,14 +325,7 @@ static BOOL api_pipe_ntlmssp_verify(pipes_struct *p, RPC_AUTH_NTLMSSP_RESP *ntlm
         * Allow guest access. Patch from Shirish Kalele <kalele@veritas.com>.
         */
 
-       if((strlen(user_name) == 0) && 
-          (ntlmssp_resp->hdr_nt_resp.str_str_len==0))
-       {
-
-               fstrcpy(pipe_user_name, lp_guestaccount(-1));
-               DEBUG(100,("Null user in NTLMSSP verification. Using guest = %s\n", pipe_user_name));
-
-       } else {
+       if (*user_name) {
 
                /* 
                 * Do the length checking only if user is not NULL.
@@ -351,24 +343,27 @@ static BOOL api_pipe_ntlmssp_verify(pipes_struct *p, RPC_AUTH_NTLMSSP_RESP *ntlm
                        return False;
 
        }
+       
+       make_auth_context_fixed(&auth_context, (uchar*)p->challenge);
 
        if (!make_user_info_netlogon_network(&user_info, 
-                                            user_name, domain, wks,  (uchar*)p->challenge, 
+                                            user_name, domain, wks,
                                             lm_owf, lm_pw_len, 
                                             nt_owf, nt_pw_len)) {
                DEBUG(0,("make_user_info_netlogon_network failed!  Failing authenticaion.\n"));
                return False;
        }
        
-       nt_status = check_password(user_info, &server_info); 
+       nt_status = auth_context->check_ntlm_password(auth_context, user_info, &server_info); 
        
+       (auth_context->free)(&auth_context);
        free_user_info(&user_info);
        
        p->ntlmssp_auth_validated = NT_STATUS_IS_OK(nt_status);
        
        if (!p->ntlmssp_auth_validated) {
-               DEBUG(1,("api_pipe_ntlmssp_verify: User %s\\%s from machine %s \
-failed authentication on named pipe %s.\n", domain, pipe_user_name, wks, p->name ));
+               DEBUG(1,("api_pipe_ntlmssp_verify: User [%s]\\[%s] from machine %s \
+failed authentication on named pipe %s.\n", domain, user_name, wks, p->name ));
                free_server_info(&server_info);
                return False;
        }
@@ -413,7 +408,7 @@ failed authentication on named pipe %s.\n", domain, pipe_user_name, wks, p->name
        }
 
        fstrcpy(p->user_name, user_name);
-       fstrcpy(p->pipe_user_name, pipe_user_name);
+       fstrcpy(p->pipe_user_name, pdb_get_username(server_info->sam_account));
        fstrcpy(p->domain, domain);
        fstrcpy(p->wks, wks);
 
@@ -421,20 +416,22 @@ failed authentication on named pipe %s.\n", domain, pipe_user_name, wks, p->name
         * Store the UNIX credential data (uid/gid pair) in the pipe structure.
         */
 
-       puid = pdb_get_uid(server_info->sam_account);
-       pgid = pdb_get_gid(server_info->sam_account);
-       
-       if (!puid || !pgid) {
+       if (!IS_SAM_UNIX_USER(server_info->sam_account)) {
                DEBUG(0,("Attempted authenticated pipe with invalid user.  No uid/gid in SAM_ACCOUNT\n"));
                free_server_info(&server_info);
                return False;
        }
        
-       p->pipe_user.uid = *puid;
-       p->pipe_user.gid = *pgid;
+       memcpy(p->session_key, server_info->session_key, sizeof(p->session_key));
+
+       uid = pdb_get_uid(server_info->sam_account);
+       gid = pdb_get_gid(server_info->sam_account);
+
+       p->pipe_user.uid = uid;
+       p->pipe_user.gid = gid;
 
        /* Set up pipe user group membership. */
-       initialise_groups(pipe_user_name, p->pipe_user.uid, p->pipe_user.gid);
+       initialise_groups(p->pipe_user_name, p->pipe_user.uid, p->pipe_user.gid);
        get_current_groups( &p->pipe_user.ngroups, &p->pipe_user.groups);
 
        if (server_info->ptok)
@@ -1190,6 +1187,13 @@ BOOL api_rpcTNP(pipes_struct *p, char *rpc_name,
                return False;
        }
 
+       if (p->bad_handle_fault_state) {
+               DEBUG(4,("api_rpcTNP: bad handle fault return.\n"));
+               p->bad_handle_fault_state = False;
+               setup_fault_pdu(p, NT_STATUS(0x1C00001A));
+               return True;
+       }
+
        slprintf(name, sizeof(name)-1, "out_%s", rpc_name);
        offset2 = prs_offset(&p->out_data.rdata);
        prs_set_offset(&p->out_data.rdata, offset1);