Wrap the unix token info in a unix_user_token in auth_serversupplied_info
[kai/samba.git] / source3 / rpc_server / srv_pipe.c
index 1ca5210842864e61b987958d3474147f79ecdb14..dcc4cd448f6518e50e2dd5ae605f6a9609f8d8f5 100644 (file)
@@ -5,7 +5,7 @@
  *  
  *  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,
@@ -14,8 +14,7 @@
  *  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/>.
  */
 
 /*  this module apparently provides an implementation of DCE/RPC over a
@@ -46,12 +45,17 @@ static void free_pipe_ntlmssp_auth_data(struct pipe_auth_data *auth)
        auth->a_u.auth_ntlmssp_state = NULL;
 }
 
+static DATA_BLOB generic_session_key(void)
+{
+       return data_blob("SystemLibraryDTC", 16);
+}
+
 /*******************************************************************
  Generate the next PDU to be returned from the data in p->rdata. 
  Handle NTLMSSP.
  ********************************************************************/
 
-static BOOL create_next_pdu_ntlmssp(pipes_struct *p)
+static bool create_next_pdu_ntlmssp(pipes_struct *p)
 {
        RPC_HDR_RESP hdr_resp;
        uint32 ss_padding_len = 0;
@@ -71,7 +75,7 @@ static BOOL create_next_pdu_ntlmssp(pipes_struct *p)
         */
 
        if(p->fault_state) {
-               setup_fault_pdu(p, NT_STATUS(0x1c010002));
+               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
                return True;
        }
 
@@ -147,7 +151,7 @@ static BOOL create_next_pdu_ntlmssp(pipes_struct *p)
         * data.
         */
 
-       prs_init( &outgoing_pdu, 0, p->mem_ctx, MARSHALL);
+       prs_init_empty( &outgoing_pdu, p->mem_ctx, MARSHALL);
        prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
 
        /* Store the header in the data stream. */
@@ -173,7 +177,7 @@ static BOOL create_next_pdu_ntlmssp(pipes_struct *p)
 
        /* Copy the sign/seal padding data. */
        if (ss_padding_len) {
-               unsigned char pad[8];
+               char pad[8];
 
                memset(pad, '\0', 8);
                if (!prs_copy_data_in(&outgoing_pdu, pad, ss_padding_len)) {
@@ -210,9 +214,9 @@ static BOOL create_next_pdu_ntlmssp(pipes_struct *p)
                case PIPE_AUTH_LEVEL_PRIVACY:
                        /* Data portion is encrypted. */
                        status = ntlmssp_seal_packet(a->ntlmssp_state,
-                                                       prs_data_p(&outgoing_pdu) + RPC_HEADER_LEN + RPC_HDR_RESP_LEN,
+                                                       (unsigned char *)prs_data_p(&outgoing_pdu) + RPC_HEADER_LEN + RPC_HDR_RESP_LEN,
                                                        data_len + ss_padding_len,
-                                                       prs_data_p(&outgoing_pdu),
+                                                       (unsigned char *)prs_data_p(&outgoing_pdu),
                                                        (size_t)prs_offset(&outgoing_pdu),
                                                        &auth_blob);
                        if (!NT_STATUS_IS_OK(status)) {
@@ -224,9 +228,9 @@ static BOOL create_next_pdu_ntlmssp(pipes_struct *p)
                case PIPE_AUTH_LEVEL_INTEGRITY:
                        /* Data is signed. */
                        status = ntlmssp_sign_packet(a->ntlmssp_state,
-                                                       prs_data_p(&outgoing_pdu) + RPC_HEADER_LEN + RPC_HDR_RESP_LEN,
+                                                       (unsigned char *)prs_data_p(&outgoing_pdu) + RPC_HEADER_LEN + RPC_HDR_RESP_LEN,
                                                        data_len + ss_padding_len,
-                                                       prs_data_p(&outgoing_pdu),
+                                                       (unsigned char *)prs_data_p(&outgoing_pdu),
                                                        (size_t)prs_offset(&outgoing_pdu),
                                                        &auth_blob);
                        if (!NT_STATUS_IS_OK(status)) {
@@ -241,7 +245,7 @@ static BOOL create_next_pdu_ntlmssp(pipes_struct *p)
        }
 
        /* Append the auth blob. */
-       if (!prs_copy_data_in(&outgoing_pdu, auth_blob.data, NTLMSSP_SIG_SIZE)) {
+       if (!prs_copy_data_in(&outgoing_pdu, (char *)auth_blob.data, NTLMSSP_SIG_SIZE)) {
                DEBUG(0,("create_next_pdu_ntlmssp: failed to add %u bytes auth blob.\n",
                                (unsigned int)NTLMSSP_SIG_SIZE));
                data_blob_free(&auth_blob);
@@ -268,7 +272,7 @@ static BOOL create_next_pdu_ntlmssp(pipes_struct *p)
  Return an schannel authenticated fragment.
  ********************************************************************/
 
-static BOOL create_next_pdu_schannel(pipes_struct *p)
+static bool create_next_pdu_schannel(pipes_struct *p)
 {
        RPC_HDR_RESP hdr_resp;
        uint32 ss_padding_len = 0;
@@ -284,7 +288,7 @@ static BOOL create_next_pdu_schannel(pipes_struct *p)
         */
 
        if(p->fault_state) {
-               setup_fault_pdu(p, NT_STATUS(0x1c010002));
+               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
                return True;
        }
 
@@ -354,7 +358,7 @@ static BOOL create_next_pdu_schannel(pipes_struct *p)
         * data.
         */
 
-       prs_init( &outgoing_pdu, 0, p->mem_ctx, MARSHALL);
+       prs_init_empty( &outgoing_pdu, p->mem_ctx, MARSHALL);
        prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
 
        /* Store the header in the data stream. */
@@ -446,7 +450,7 @@ static BOOL create_next_pdu_schannel(pipes_struct *p)
  No authentication done.
 ********************************************************************/
 
-static BOOL create_next_pdu_noauth(pipes_struct *p)
+static bool create_next_pdu_noauth(pipes_struct *p)
 {
        RPC_HDR_RESP hdr_resp;
        uint32 data_len;
@@ -460,7 +464,7 @@ static BOOL create_next_pdu_noauth(pipes_struct *p)
         */
 
        if(p->fault_state) {
-               setup_fault_pdu(p, NT_STATUS(0x1c010002));
+               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
                return True;
        }
 
@@ -527,7 +531,7 @@ static BOOL create_next_pdu_noauth(pipes_struct *p)
         * data.
         */
 
-       prs_init( &outgoing_pdu, 0, p->mem_ctx, MARSHALL);
+       prs_init_empty( &outgoing_pdu, p->mem_ctx, MARSHALL);
        prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
 
        /* Store the header in the data stream. */
@@ -567,7 +571,7 @@ static BOOL create_next_pdu_noauth(pipes_struct *p)
  Generate the next PDU to be returned from the data in p->rdata. 
 ********************************************************************/
 
-BOOL create_next_pdu(pipes_struct *p)
+bool create_next_pdu(pipes_struct *p)
 {
        switch(p->auth.auth_level) {
                case PIPE_AUTH_LEVEL_NONE:
@@ -600,27 +604,25 @@ BOOL create_next_pdu(pipes_struct *p)
  the pipe struct.
 *******************************************************************/
 
-static BOOL pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
+static bool pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
 {
        DATA_BLOB reply;
        NTSTATUS status;
        AUTH_NTLMSSP_STATE *a = p->auth.a_u.auth_ntlmssp_state;
 
-       DEBUG(5,("pipe_ntlmssp_verify_final: checking user details\n"));
+       DEBUG(5,("pipe_ntlmssp_verify_final: pipe %s checking user details\n", p->name));
 
        ZERO_STRUCT(reply);
 
-       memset(p->user_name, '\0', sizeof(p->user_name));
-       memset(p->pipe_user_name, '\0', sizeof(p->pipe_user_name));
-       memset(p->domain, '\0', sizeof(p->domain));
-       memset(p->wks, '\0', sizeof(p->wks));
-
        /* Set up for non-authenticated user. */
-       delete_nt_token(&p->pipe_user.nt_user_token);
-       p->pipe_user.ngroups = 0;
-       SAFE_FREE( p->pipe_user.groups);
+       TALLOC_FREE(p->pipe_user.nt_user_token);
+       p->pipe_user.ut.ngroups = 0;
+       SAFE_FREE( p->pipe_user.ut.groups);
 
+       /* this has to be done as root in order to verify the password */
+       become_root();
        status = auth_ntlmssp_update(a, *p_resp_blob, &reply);
+       unbecome_root();
 
        /* Don't generate a reply. */
        data_blob_free(&reply);
@@ -629,41 +631,63 @@ static BOOL pipe_ntlmssp_verify_final(pipes_struct *p, DATA_BLOB *p_resp_blob)
                return False;
        }
 
-       fstrcpy(p->user_name, a->ntlmssp_state->user);
-       fstrcpy(p->pipe_user_name, a->server_info->unix_name);
-       fstrcpy(p->domain, a->ntlmssp_state->domain);
-       fstrcpy(p->wks, a->ntlmssp_state->workstation);
+       /* Finally - if the pipe negotiated integrity (sign) or privacy (seal)
+          ensure the underlying NTLMSSP flags are also set. If not we should
+          refuse the bind. */
+
+       if (p->auth.auth_level == PIPE_AUTH_LEVEL_INTEGRITY) {
+               if (!(a->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
+                       DEBUG(0,("pipe_ntlmssp_verify_final: pipe %s : packet integrity requested "
+                               "but client declined signing.\n",
+                                       p->name ));
+                       return False;
+               }
+       }
+       if (p->auth.auth_level == PIPE_AUTH_LEVEL_PRIVACY) {
+               if (!(a->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
+                       DEBUG(0,("pipe_ntlmssp_verify_final: pipe %s : packet privacy requested "
+                               "but client declined sealing.\n",
+                                       p->name ));
+                       return False;
+               }
+       }
 
-       DEBUG(5,("pipe_ntlmssp_verify_final: OK: user: %s domain: %s workstation: %s\n",
-               p->user_name, p->domain, p->wks));
+       DEBUG(5, ("pipe_ntlmssp_verify_final: OK: user: %s domain: %s "
+                 "workstation: %s\n", a->ntlmssp_state->user,
+                 a->ntlmssp_state->domain, a->ntlmssp_state->workstation));
 
        /*
         * Store the UNIX credential data (uid/gid pair) in the pipe structure.
         */
 
-       p->pipe_user.uid = a->server_info->uid;
-       p->pipe_user.gid = a->server_info->gid;
+       p->pipe_user.ut.uid = a->server_info->utok.uid;
+       p->pipe_user.ut.gid = a->server_info->utok.gid;
        
        /*
-        * Copy the session key from the ntlmssp state.
+        * We're an authenticated bind over smbd, so the session key needs to
+        * be set to "SystemLibraryDTC". Weird, but this is what Windows
+        * does. See the RPC-SAMBA3SESSIONKEY.
         */
 
        data_blob_free(&p->session_key);
-       p->session_key = data_blob(a->ntlmssp_state->session_key.data, a->ntlmssp_state->session_key.length);
+       p->session_key = generic_session_key();
        if (!p->session_key.data) {
                return False;
        }
 
-       p->pipe_user.ngroups = a->server_info->n_groups;
-       if (p->pipe_user.ngroups) {
-               if (!(p->pipe_user.groups = memdup(a->server_info->groups, sizeof(gid_t) * p->pipe_user.ngroups))) {
+       p->pipe_user.ut.ngroups = a->server_info->utok.ngroups;
+       if (p->pipe_user.ut.ngroups) {
+               if (!(p->pipe_user.ut.groups = (gid_t *)memdup(
+                             a->server_info->utok.groups,
+                             sizeof(gid_t) * p->pipe_user.ut.ngroups))) {
                        DEBUG(0,("failed to memdup group list to p->pipe_user.groups\n"));
                        return False;
                }
        }
 
        if (a->server_info->ptok) {
-               p->pipe_user.nt_user_token = dup_nt_token(a->server_info->ptok);
+               p->pipe_user.nt_user_token =
+                       dup_nt_token(NULL, a->server_info->ptok);
        } else {
                DEBUG(1,("Error: Authmodule failed to provide nt_user_token\n"));
                p->pipe_user.nt_user_token = NULL;
@@ -682,7 +706,7 @@ struct rpc_table {
                const char *clnt;
                const char *srv;
        } pipe;
-       struct api_struct *cmds;
+       const struct api_struct *cmds;
        int n_cmds;
 };
 
@@ -693,7 +717,7 @@ static int rpc_lookup_size;
  This is the "stage3" NTLMSSP response after a bind request and reply.
 *******************************************************************/
 
-BOOL api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
+bool api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
 {
        RPC_HDR_AUTH auth_info;
        uint32 pad;
@@ -731,7 +755,7 @@ BOOL api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
 
        blob = data_blob(NULL,p->hdr.auth_len);
 
-       if (!prs_copy_data_out(blob.data, rpc_in_p, p->hdr.auth_len)) {
+       if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
                DEBUG(0,("api_pipe_bind_auth3: Failed to pull %u bytes - the response blob.\n",
                        (unsigned int)p->hdr.auth_len ));
                goto err;
@@ -765,7 +789,7 @@ BOOL api_pipe_bind_auth3(pipes_struct *p, prs_struct *rpc_in_p)
  Marshall a bind_nak pdu.
 *******************************************************************/
 
-static BOOL setup_bind_nak(pipes_struct *p)
+static bool setup_bind_nak(pipes_struct *p)
 {
        prs_struct outgoing_rpc;
        RPC_HDR nak_hdr;
@@ -780,7 +804,7 @@ static BOOL setup_bind_nak(pipes_struct *p)
         * header and are never sending more than one PDU here.
         */
 
-       prs_init( &outgoing_rpc, 0, p->mem_ctx, MARSHALL);
+       prs_init_empty( &outgoing_rpc, p->mem_ctx, MARSHALL);
        prs_give_memory( &outgoing_rpc, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
 
        /*
@@ -827,7 +851,7 @@ static BOOL setup_bind_nak(pipes_struct *p)
  Marshall a fault pdu.
 *******************************************************************/
 
-BOOL setup_fault_pdu(pipes_struct *p, NTSTATUS status)
+bool setup_fault_pdu(pipes_struct *p, NTSTATUS status)
 {
        prs_struct outgoing_pdu;
        RPC_HDR fault_hdr;
@@ -843,7 +867,7 @@ BOOL setup_fault_pdu(pipes_struct *p, NTSTATUS status)
         * header and are never sending more than one PDU here.
         */
 
-       prs_init( &outgoing_pdu, 0, p->mem_ctx, MARSHALL);
+       prs_init_empty( &outgoing_pdu, p->mem_ctx, MARSHALL);
        prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
 
        /*
@@ -892,12 +916,61 @@ BOOL setup_fault_pdu(pipes_struct *p, NTSTATUS status)
        return True;
 }
 
+#if 0
+/*******************************************************************
+ Marshall a cancel_ack pdu.
+ We should probably check the auth-verifier here.
+*******************************************************************/
+
+bool setup_cancel_ack_reply(pipes_struct *p, prs_struct *rpc_in_p)
+{
+       prs_struct outgoing_pdu;
+       RPC_HDR ack_reply_hdr;
+
+       /* Free any memory in the current return data buffer. */
+       prs_mem_free(&p->out_data.rdata);
+
+       /*
+        * Marshall directly into the outgoing PDU space. We
+        * must do this as we need to set to the bind response
+        * header and are never sending more than one PDU here.
+        */
+
+       prs_init_empty( &outgoing_pdu, p->mem_ctx, MARSHALL);
+       prs_give_memory( &outgoing_pdu, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
+
+       /*
+        * Initialize a cancel_ack header.
+        */
+
+       init_rpc_hdr(&ack_reply_hdr, RPC_CANCEL_ACK, RPC_FLG_FIRST | RPC_FLG_LAST,
+                       p->hdr.call_id, RPC_HEADER_LEN, 0);
+
+       /*
+        * Marshall the header into the outgoing PDU.
+        */
+
+       if(!smb_io_rpc_hdr("", &ack_reply_hdr, &outgoing_pdu, 0)) {
+               DEBUG(0,("setup_cancel_ack_reply: marshalling of RPC_HDR failed.\n"));
+               prs_mem_free(&outgoing_pdu);
+               return False;
+       }
+
+       p->out_data.data_sent_length = 0;
+       p->out_data.current_pdu_len = prs_offset(&outgoing_pdu);
+       p->out_data.current_pdu_sent = 0;
+
+       prs_mem_free(&outgoing_pdu);
+       return True;
+}
+#endif
+
 /*******************************************************************
  Ensure a bind request has the correct abstract & transfer interface.
  Used to reject unknown binds from Win2k.
 *******************************************************************/
 
-BOOL check_bind_req(struct pipes_struct *p, RPC_IFACE* abstract,
+bool check_bind_req(struct pipes_struct *p, RPC_IFACE* abstract,
                     RPC_IFACE* transfer, uint32 context_id)
 {
        char *pipe_name = p->name;
@@ -912,12 +985,12 @@ BOOL check_bind_req(struct pipes_struct *p, RPC_IFACE* abstract,
        /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */
                
        for ( i=0; pipe_names[i].client_pipe; i++ ) {
-               DEBUG(10,("checking %s\n", pipe_names[i].client_pipe));
+               DEBUGADD(10,("checking %s\n", pipe_names[i].client_pipe));
                if ( strequal(pipe_names[i].client_pipe, pname)
-                       && (abstract->version == pipe_names[i].abstr_syntax.version) 
-                       && (memcmp(&abstract->uuid, &pipe_names[i].abstr_syntax.uuid, sizeof(struct uuid)) == 0)
-                       && (transfer->version == pipe_names[i].trans_syntax.version)
-                       && (memcmp(&transfer->uuid, &pipe_names[i].trans_syntax.uuid, sizeof(struct uuid)) == 0) ) {
+                       && (abstract->if_version == pipe_names[i].abstr_syntax->if_version) 
+                       && (memcmp(&abstract->uuid, &pipe_names[i].abstr_syntax->uuid, sizeof(struct GUID)) == 0)
+                       && (transfer->if_version == pipe_names[i].trans_syntax->if_version)
+                       && (memcmp(&transfer->uuid, &pipe_names[i].trans_syntax->uuid, sizeof(struct GUID)) == 0) ) {
                        struct api_struct       *fns = NULL;
                        int                     n_fns = 0;
                        PIPE_RPC_FNS            *context_fns;
@@ -981,7 +1054,7 @@ NTSTATUS rpc_pipe_register_commands(int version, const char *clnt, const char *s
            rpc_lookup will still be valid afterwards.  It could then succeed if
            called again later */
        rpc_lookup_size++;
-        rpc_entry = SMB_REALLOC_ARRAY(rpc_lookup, struct rpc_table, rpc_lookup_size);
+        rpc_entry = SMB_REALLOC_ARRAY_KEEP_OLD_ON_ERROR(rpc_lookup, struct rpc_table, rpc_lookup_size);
         if (NULL == rpc_entry) {
                 rpc_lookup_size--;
                 DEBUG(0, ("rpc_pipe_register_commands: memory allocation failed\n"));
@@ -994,9 +1067,8 @@ NTSTATUS rpc_pipe_register_commands(int version, const char *clnt, const char *s
         ZERO_STRUCTP(rpc_entry);
         rpc_entry->pipe.clnt = SMB_STRDUP(clnt);
         rpc_entry->pipe.srv = SMB_STRDUP(srv);
-        rpc_entry->cmds = SMB_REALLOC_ARRAY(rpc_entry->cmds, struct api_struct, rpc_entry->n_cmds + size);
-        memcpy(rpc_entry->cmds + rpc_entry->n_cmds, cmds, size * sizeof(struct api_struct));
-        rpc_entry->n_cmds += size;
+        rpc_entry->cmds = cmds;
+        rpc_entry->n_cmds = size;
         
         return NT_STATUS_OK;
 }
@@ -1005,7 +1077,7 @@ NTSTATUS rpc_pipe_register_commands(int version, const char *clnt, const char *s
  Handle a SPNEGO krb5 bind auth.
 *******************************************************************/
 
-static BOOL pipe_spnego_auth_bind_kerberos(pipes_struct *p, prs_struct *rpc_in_p, RPC_HDR_AUTH *pauth_info,
+static bool pipe_spnego_auth_bind_kerberos(pipes_struct *p, prs_struct *rpc_in_p, RPC_HDR_AUTH *pauth_info,
                DATA_BLOB *psecblob, prs_struct *pout_auth)
 {
        return False;
@@ -1015,7 +1087,7 @@ static BOOL pipe_spnego_auth_bind_kerberos(pipes_struct *p, prs_struct *rpc_in_p
  Handle the first part of a SPNEGO bind auth.
 *******************************************************************/
 
-static BOOL pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_p,
+static bool pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_p,
                                        RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
 {
        DATA_BLOB blob;
@@ -1025,7 +1097,7 @@ static BOOL pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
        char *OIDs[ASN1_MAX_OIDS];
         int i;
        NTSTATUS status;
-        BOOL got_kerberos_mechanism = False;
+        bool got_kerberos_mechanism = false;
        AUTH_NTLMSSP_STATE *a = NULL;
        RPC_HDR_AUTH auth_info;
 
@@ -1036,7 +1108,7 @@ static BOOL pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
        /* Grab the SPNEGO blob. */
        blob = data_blob(NULL,p->hdr.auth_len);
 
-       if (!prs_copy_data_out(blob.data, rpc_in_p, p->hdr.auth_len)) {
+       if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
                DEBUG(0,("pipe_spnego_auth_bind_negotiate: Failed to pull %u bytes - the SPNEGO auth header.\n",
                        (unsigned int)p->hdr.auth_len ));
                goto err;
@@ -1053,7 +1125,7 @@ static BOOL pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
         }
 
        if (strcmp(OID_KERBEROS5, OIDs[0]) == 0 || strcmp(OID_KERBEROS5_OLD, OIDs[0]) == 0) {
-               got_kerberos_mechanism = True;
+               got_kerberos_mechanism = true;
        }
 
        for (i=0;OIDs[i];i++) {
@@ -1063,7 +1135,7 @@ static BOOL pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
        DEBUG(3,("pipe_spnego_auth_bind_negotiate: Got secblob of size %lu\n", (unsigned long)secblob.length));
 
        if ( got_kerberos_mechanism && ((lp_security()==SEC_ADS) || lp_use_kerberos_keytab()) ) {
-               BOOL ret = pipe_spnego_auth_bind_kerberos(p, rpc_in_p, pauth_info, &secblob, pout_auth);
+               bool ret = pipe_spnego_auth_bind_kerberos(p, rpc_in_p, pauth_info, &secblob, pout_auth);
                data_blob_free(&secblob);
                data_blob_free(&blob);
                return ret;
@@ -1074,27 +1146,38 @@ static BOOL pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
                free_pipe_ntlmssp_auth_data(&p->auth);
        }
 
-       /* Initialize the NTLM engine. */
-       status = auth_ntlmssp_start(&a);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto err;
-       }
+       if (!got_kerberos_mechanism) {
+               /* Initialize the NTLM engine. */
+               status = auth_ntlmssp_start(&a);
+               if (!NT_STATUS_IS_OK(status)) {
+                       goto err;
+               }
 
-       /*
-        * Pass the first security blob of data to it.
-        * This can return an error or NT_STATUS_MORE_PROCESSING_REQUIRED
-        * which means we need another packet to complete the bind.
-        */
+               /*
+                * Pass the first security blob of data to it.
+                * This can return an error or NT_STATUS_MORE_PROCESSING_REQUIRED
+                * which means we need another packet to complete the bind.
+                */
 
-        status = auth_ntlmssp_update(a, secblob, &chal);
+               status = auth_ntlmssp_update(a, secblob, &chal);
 
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-               DEBUG(3,("pipe_spnego_auth_bind_negotiate: auth_ntlmssp_update failed.\n"));
-               goto err;
-       }
+               if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+                       DEBUG(3,("pipe_spnego_auth_bind_negotiate: auth_ntlmssp_update failed.\n"));
+                       goto err;
+               }
 
-       /* Generate the response blob we need for step 2 of the bind. */
-       response = spnego_gen_auth_response(&chal, status, OID_NTLMSSP);
+               /* Generate the response blob we need for step 2 of the bind. */
+               response = spnego_gen_auth_response(&chal, status, OID_NTLMSSP);
+       } else {
+               /*
+                * SPNEGO negotiate down to NTLMSSP. The subsequent
+                * code to process follow-up packets is not complete
+                * yet. JRA.
+                */
+               response = spnego_gen_auth_response(NULL,
+                                       NT_STATUS_MORE_PROCESSING_REQUIRED,
+                                       OID_NTLMSSP);
+       }
 
        /* Copy the blob into the pout_auth parse struct */
        init_rpc_hdr_auth(&auth_info, RPC_SPNEGO_AUTH_TYPE, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
@@ -1103,7 +1186,7 @@ static BOOL pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
                goto err;
        }
 
-       if (!prs_copy_data_in(pout_auth, response.data, response.length)) {
+       if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
                DEBUG(0,("pipe_spnego_auth_bind_negotiate: marshalling of data blob failed.\n"));
                goto err;
        }
@@ -1136,16 +1219,25 @@ static BOOL pipe_spnego_auth_bind_negotiate(pipes_struct *p, prs_struct *rpc_in_
  Handle the second part of a SPNEGO bind auth.
 *******************************************************************/
 
-static BOOL pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p,
+static bool pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p,
                                        RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
 {
-       DATA_BLOB spnego_blob, auth_blob, auth_reply;
+       RPC_HDR_AUTH auth_info;
+       DATA_BLOB spnego_blob;
+       DATA_BLOB auth_blob;
+       DATA_BLOB auth_reply;
+       DATA_BLOB response;
        AUTH_NTLMSSP_STATE *a = p->auth.a_u.auth_ntlmssp_state;
 
        ZERO_STRUCT(spnego_blob);
        ZERO_STRUCT(auth_blob);
        ZERO_STRUCT(auth_reply);
+       ZERO_STRUCT(response);
 
+       /*
+        * NB. If we've negotiated down from krb5 to NTLMSSP we'll currently
+        * fail here as 'a' == NULL.
+        */
        if (p->auth.auth_type != PIPE_AUTH_TYPE_SPNEGO_NTLMSSP || !a) {
                DEBUG(0,("pipe_spnego_auth_bind_continue: not in NTLMSSP auth state.\n"));
                goto err;
@@ -1154,7 +1246,7 @@ static BOOL pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
        /* Grab the SPNEGO blob. */
        spnego_blob = data_blob(NULL,p->hdr.auth_len);
 
-       if (!prs_copy_data_out(spnego_blob.data, rpc_in_p, p->hdr.auth_len)) {
+       if (!prs_copy_data_out((char *)spnego_blob.data, rpc_in_p, p->hdr.auth_len)) {
                DEBUG(0,("pipe_spnego_auth_bind_continue: Failed to pull %u bytes - the SPNEGO auth header.\n",
                        (unsigned int)p->hdr.auth_len ));
                goto err;
@@ -1174,14 +1266,31 @@ static BOOL pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
         * The following call actually checks the challenge/response data.
         * for correctness against the given DOMAIN\user name.
         */
-       
+
        if (!pipe_ntlmssp_verify_final(p, &auth_blob)) {
                goto err;
        }
 
        data_blob_free(&spnego_blob);
        data_blob_free(&auth_blob);
+
+       /* Generate the spnego "accept completed" blob - no incoming data. */
+       response = spnego_gen_auth_response(&auth_reply, NT_STATUS_OK, OID_NTLMSSP);
+
+       /* Copy the blob into the pout_auth parse struct */
+       init_rpc_hdr_auth(&auth_info, RPC_SPNEGO_AUTH_TYPE, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
+       if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
+               DEBUG(0,("pipe_spnego_auth_bind_continue: marshalling of RPC_HDR_AUTH failed.\n"));
+               goto err;
+       }
+
+       if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
+               DEBUG(0,("pipe_spnego_auth_bind_continue: marshalling of data blob failed.\n"));
+               goto err;
+       }
+
        data_blob_free(&auth_reply);
+       data_blob_free(&response);
 
        p->pipe_bound = True;
 
@@ -1192,6 +1301,7 @@ static BOOL pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
        data_blob_free(&spnego_blob);
        data_blob_free(&auth_blob);
        data_blob_free(&auth_reply);
+       data_blob_free(&response);
 
        free_pipe_ntlmssp_auth_data(&p->auth);
        p->auth.a_u.auth_ntlmssp_state = NULL;
@@ -1203,14 +1313,14 @@ static BOOL pipe_spnego_auth_bind_continue(pipes_struct *p, prs_struct *rpc_in_p
  Handle an schannel bind auth.
 *******************************************************************/
 
-static BOOL pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
+static bool pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                                        RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
 {
        RPC_HDR_AUTH auth_info;
        RPC_AUTH_SCHANNEL_NEG neg;
        RPC_AUTH_VERIFIER auth_verifier;
-       BOOL ret;
-       struct dcinfo stored_dcinfo;
+       bool ret;
+       struct dcinfo *pdcinfo;
        uint32 flags;
 
        if (!smb_io_rpc_auth_schannel_neg("", &neg, rpc_in_p, 0)) {
@@ -1218,10 +1328,14 @@ static BOOL pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                return False;
        }
 
-       ZERO_STRUCT(stored_dcinfo);
+       /*
+        * The neg.myname key here must match the remote computer name
+        * given in the DOM_CLNT_SRV.uni_comp_name used on all netlogon pipe
+        * operations that use credentials.
+        */
 
        become_root();
-       ret = secrets_restore_schannel_session_info(p->mem_ctx, neg.myname, &stored_dcinfo);
+       ret = secrets_restore_schannel_session_info(p->mem_ctx, neg.myname, &pdcinfo);
        unbecome_root();
 
        if (!ret) {
@@ -1231,28 +1345,36 @@ static BOOL pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
 
        p->auth.a_u.schannel_auth = TALLOC_P(p->pipe_state_mem_ctx, struct schannel_auth_struct);
        if (!p->auth.a_u.schannel_auth) {
+               TALLOC_FREE(pdcinfo);
                return False;
        }
 
        memset(p->auth.a_u.schannel_auth->sess_key, 0, sizeof(p->auth.a_u.schannel_auth->sess_key));
-       memcpy(p->auth.a_u.schannel_auth->sess_key, stored_dcinfo.sess_key, sizeof(stored_dcinfo.sess_key));
+       memcpy(p->auth.a_u.schannel_auth->sess_key, pdcinfo->sess_key,
+                       sizeof(pdcinfo->sess_key));
+
+       TALLOC_FREE(pdcinfo);
 
        p->auth.a_u.schannel_auth->seq_num = 0;
 
        /*
         * JRA. Should we also copy the schannel session key into the pipe session key p->session_key
-        * here ? We do that for NTLMSPP, but the session key is already set up from the vuser
+        * here ? We do that for NTLMSSP, but the session key is already set up from the vuser
         * struct of the person who opened the pipe. I need to test this further. JRA.
+        *
+        * VL. As we are mapping this to guest set the generic key
+        * "SystemLibraryDTC" key here. It's a bit difficult to test against
+        * W2k3, as it does not allow schannel binds against SAMR and LSA
+        * anymore.
         */
 
-       /* The client opens a second RPC NETLOGON pipe without
-               doing a auth2. The credentials for the schannel are
-               re-used from the auth2 the client did before. */
-       p->dc = TALLOC_ZERO_P(p->pipe_state_mem_ctx, struct dcinfo);
-       if (!p->dc) {
+       data_blob_free(&p->session_key);
+       p->session_key = generic_session_key();
+       if (p->session_key.data == NULL) {
+               DEBUG(0, ("pipe_schannel_auth_bind: Could not alloc session"
+                         " key\n"));
                return False;
        }
-       *p->dc = stored_dcinfo;
 
        init_rpc_hdr_auth(&auth_info, RPC_SCHANNEL_AUTH_TYPE, pauth_info->auth_level, RPC_HDR_AUTH_LEN, 1);
        if(!smb_io_rpc_hdr_auth("", &auth_info, pout_auth, 0)) {
@@ -1291,7 +1413,7 @@ static BOOL pipe_schannel_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
  Handle an NTLMSSP bind auth.
 *******************************************************************/
 
-static BOOL pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
+static bool pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                                        RPC_HDR_AUTH *pauth_info, prs_struct *pout_auth)
 {
        RPC_HDR_AUTH auth_info;
@@ -1306,13 +1428,13 @@ static BOOL pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
        /* Grab the NTLMSSP blob. */
        blob = data_blob(NULL,p->hdr.auth_len);
 
-       if (!prs_copy_data_out(blob.data, rpc_in_p, p->hdr.auth_len)) {
+       if (!prs_copy_data_out((char *)blob.data, rpc_in_p, p->hdr.auth_len)) {
                DEBUG(0,("pipe_ntlmssp_auth_bind: Failed to pull %u bytes - the NTLM auth header.\n",
                        (unsigned int)p->hdr.auth_len ));
                goto err;
        }
 
-       if (strncmp(blob.data, "NTLMSSP", 7) != 0) {
+       if (strncmp((char *)blob.data, "NTLMSSP", 7) != 0) {
                DEBUG(0,("pipe_ntlmssp_auth_bind: Failed to read NTLMSSP in blob\n"));
                 goto err;
         }
@@ -1341,7 +1463,7 @@ static BOOL pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
                goto err;
        }
 
-       if (!prs_copy_data_in(pout_auth, response.data, response.length)) {
+       if (!prs_copy_data_in(pout_auth, (char *)response.data, response.length)) {
                DEBUG(0,("pipe_ntlmssp_auth_bind: marshalling of data blob failed.\n"));
                goto err;
        }
@@ -1372,7 +1494,7 @@ static BOOL pipe_ntlmssp_auth_bind(pipes_struct *p, prs_struct *rpc_in_p,
  Respond to a pipe bind request.
 *******************************************************************/
 
-BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
+bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 {
        RPC_HDR_BA hdr_ba;
        RPC_HDR_RB hdr_rb;
@@ -1392,7 +1514,7 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                return setup_bind_nak(p);
        }
 
-       prs_init( &outgoing_rpc, 0, p->mem_ctx, MARSHALL);
+       prs_init_empty( &outgoing_rpc, p->mem_ctx, MARSHALL);
 
        /* 
         * Marshall directly into the outgoing PDU space. We
@@ -1463,6 +1585,8 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
                }
        }
 
+       ZERO_STRUCT(hdr_rb);
+
        /* decode the bind request */
        if(!smb_io_rpc_hdr_rb("", &hdr_rb, rpc_in_p, 0))  {
                DEBUG(0,("api_pipe_bind_req: unable to unmarshall RPC_HDR_RB struct.\n"));
@@ -1532,11 +1656,18 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 
                case RPC_ANONYMOUS_AUTH_TYPE:
                        /* Unauthenticated bind request. */
+                       /* Get the authenticated pipe user from current_user */
+                       if (!copy_current_user(&p->pipe_user, &current_user)) {
+                               DEBUG(10, ("Could not copy current user\n"));
+                               goto err_exit;
+                       }
                        /* We're finished - no more packets. */
                        p->auth.auth_type = PIPE_AUTH_TYPE_NONE;
                        /* We must set the pipe auth_level here also. */
                        p->auth.auth_level = PIPE_AUTH_LEVEL_NONE;
                        p->pipe_bound = True;
+                       /* The session key was initialized from the SMB
+                        * session in make_internal_rpc_pipe_p */
                        break;
 
                default:
@@ -1645,7 +1776,7 @@ BOOL api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
  SPNEGO calls.
 ****************************************************************************/
 
-BOOL api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
+bool api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
 {
        RPC_HDR_BA hdr_ba;
        RPC_HDR_RB hdr_rb;
@@ -1657,7 +1788,7 @@ BOOL api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
        prs_struct outgoing_rpc;
        int auth_len = 0;
 
-       prs_init( &outgoing_rpc, 0, p->mem_ctx, MARSHALL);
+       prs_init_empty( &outgoing_rpc, p->mem_ctx, MARSHALL);
 
        /* 
         * Marshall directly into the outgoing PDU space. We
@@ -1836,7 +1967,7 @@ BOOL api_pipe_alter_context(pipes_struct *p, prs_struct *rpc_in_p)
  Deal with NTLMSSP sign & seal processing on an RPC request.
 ****************************************************************************/
 
-BOOL api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in,
+bool api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in,
                                        uint32 *p_ss_padding_len, NTSTATUS *pstatus)
 {
        RPC_HDR_AUTH auth_info;
@@ -1896,7 +2027,7 @@ BOOL api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in,
                return False;
        }
 
-       auth_blob.data = prs_data_p(rpc_in) + prs_offset(rpc_in);
+       auth_blob.data = (unsigned char *)prs_data_p(rpc_in) + prs_offset(rpc_in);
        auth_blob.length = auth_len;
        
        switch (p->auth.auth_level) {
@@ -1952,7 +2083,7 @@ BOOL api_pipe_ntlmssp_auth_process(pipes_struct *p, prs_struct *rpc_in,
  Deal with schannel processing on an RPC request.
 ****************************************************************************/
 
-BOOL api_pipe_schannel_process(pipes_struct *p, prs_struct *rpc_in, uint32 *p_ss_padding_len)
+bool api_pipe_schannel_process(pipes_struct *p, prs_struct *rpc_in, uint32 *p_ss_padding_len)
 {
        uint32 data_len;
        uint32 auth_len;
@@ -2104,10 +2235,10 @@ void free_pipe_rpc_context( PIPE_RPC_FNS *list )
  before doing the call.
 ****************************************************************************/
 
-BOOL api_pipe_request(pipes_struct *p)
+bool api_pipe_request(pipes_struct *p)
 {
-       BOOL ret = False;
-       BOOL changed_user = False;
+       bool ret = False;
+       bool changed_user = False;
        PIPE_RPC_FNS *pipe_fns;
        
        if (p->pipe_bound &&
@@ -2127,9 +2258,9 @@ BOOL api_pipe_request(pipes_struct *p)
        pipe_fns = find_pipe_fns_by_context(p->contexts, p->hdr_req.context_id);
        
        if ( pipe_fns ) {
-               set_current_rpc_talloc(p->mem_ctx);
+               TALLOC_CTX *frame = talloc_stackframe();
                ret = api_rpcTNP(p, p->name, pipe_fns->cmds, pipe_fns->n_cmds);
-               set_current_rpc_talloc(NULL);   
+               TALLOC_FREE(frame);
        }
        else {
                DEBUG(0,("api_pipe_request: No rpc function table associated with context [%d] on pipe [%s]\n",
@@ -2147,7 +2278,7 @@ BOOL api_pipe_request(pipes_struct *p)
  Calls the underlying RPC function for a named pipe.
  ********************************************************************/
 
-BOOL api_rpcTNP(pipes_struct *p, const char *rpc_name, 
+bool api_rpcTNP(pipes_struct *p, const char *rpc_name, 
                const struct api_struct *api_rpc_cmds, int n_cmds)
 {
        int fn_num;
@@ -2174,7 +2305,7 @@ BOOL api_rpcTNP(pipes_struct *p, const char *rpc_name,
                 * and not put the pipe into fault state. JRA.
                 */
                DEBUG(4, ("unknown\n"));
-               setup_fault_pdu(p, NT_STATUS(0x1c010002));
+               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
                return True;
        }
 
@@ -2192,7 +2323,14 @@ BOOL api_rpcTNP(pipes_struct *p, const char *rpc_name,
        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));
+               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_CONTEXT_MISMATCH));
+               return True;
+       }
+
+       if (p->rng_fault_state) {
+               DEBUG(4, ("api_rpcTNP: rng fault return\n"));
+               p->rng_fault_state = False;
+               setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
                return True;
        }
 
@@ -2209,7 +2347,7 @@ BOOL api_rpcTNP(pipes_struct *p, const char *rpc_name,
        if ((DEBUGLEVEL >= 10) && 
            (prs_offset(&p->in_data.data) != prs_data_size(&p->in_data.data))) {
                size_t data_len = prs_data_size(&p->in_data.data) - prs_offset(&p->in_data.data);
-               char *data = SMB_MALLOC(data_len);
+               char *data = (char *)SMB_MALLOC(data_len);
 
                DEBUG(10, ("api_rpcTNP: rpc input buffer underflow (parse error?)\n"));
                if (data) {
@@ -2232,16 +2370,16 @@ void get_pipe_fns( int idx, struct api_struct **fns, int *n_fns )
 
        switch ( idx ) {
                case PI_LSARPC:
-                       lsa_get_pipe_fns( &cmds, &n_cmds );
+                       lsarpc_get_pipe_fns( &cmds, &n_cmds );
                        break;
-               case PI_LSARPC_DS:
-                       lsa_ds_get_pipe_fns( &cmds, &n_cmds );
+               case PI_DSSETUP:
+                       dssetup_get_pipe_fns( &cmds, &n_cmds );
                        break;
                case PI_SAMR:
                        samr_get_pipe_fns( &cmds, &n_cmds );
                        break;
                case PI_NETLOGON:
-                       netlog_get_pipe_fns( &cmds, &n_cmds );
+                       netlogon_get_pipe_fns( &cmds, &n_cmds );
                        break;
                case PI_SRVSVC:
                        srvsvc_get_pipe_fns( &cmds, &n_cmds );
@@ -2250,7 +2388,7 @@ void get_pipe_fns( int idx, struct api_struct **fns, int *n_fns )
                        wkssvc_get_pipe_fns( &cmds, &n_cmds );
                        break;
                case PI_WINREG:
-                       reg_get_pipe_fns( &cmds, &n_cmds );
+                       winreg_get_pipe_fns( &cmds, &n_cmds );
                        break;
                case PI_SPOOLSS:
                        spoolss_get_pipe_fns( &cmds, &n_cmds );
@@ -2259,17 +2397,17 @@ void get_pipe_fns( int idx, struct api_struct **fns, int *n_fns )
                        netdfs_get_pipe_fns( &cmds, &n_cmds );
                        break;
                case PI_SVCCTL:
-                       svcctl_get_pipe_fns( &cmds, &n_cmds );
+                       svcctl2_get_pipe_fns( &cmds, &n_cmds );
                        break;
                case PI_EVENTLOG:
-                       eventlog_get_pipe_fns( &cmds, &n_cmds );
+                       eventlog2_get_pipe_fns( &cmds, &n_cmds );
                        break;
                case PI_NTSVCS:
-                       ntsvcs_get_pipe_fns( &cmds, &n_cmds );
+                       ntsvcs2_get_pipe_fns( &cmds, &n_cmds );
                        break;
 #ifdef DEVELOPER
-               case PI_ECHO:
-                       echo_get_pipe_fns( &cmds, &n_cmds );
+               case PI_RPCECHO:
+                       rpcecho_get_pipe_fns( &cmds, &n_cmds );
                        break;
 #endif
                default: