sync 3.0 into HEAD for the last time

[tprouty/samba.git] / source / include / ntdomain.h

diff --git a/source/include/ntdomain.h b/source/include/ntdomain.h
index a784fd2eba0a4e19a4c592325000bd934dd5a4d9..ccbc190c59d65e67e2142580ef3bf4f035fb2f6c 100644 (file)
--- a/source/include/ntdomain.h
+++ b/source/include/ntdomain.h
@@ -156,12 +156,30 @@ struct dcinfo
        uchar  md4pw[16];   /* md4(machine password) */
 
        fstring mach_acct;  /* Machine name we've authenticated. */
+
+       fstring remote_machine;  /* Machine name we've authenticated. */
+
+       BOOL challenge_sent;
+       BOOL got_session_key;
+       BOOL authenticated;
+
 };
 
+typedef struct pipe_rpc_fns {
+
+       struct pipe_rpc_fns *next, *prev;
+       
+       /* RPC function table associated with the current rpc_bind (associated by context) */
+       
+       struct api_struct *cmds;
+       int n_cmds;
+       uint32 context_id;
+       
+} PIPE_RPC_FNS;
+
 /*
  * DCE/RPC-specific samba-internal-specific handling of data on
  * NamedPipes.
- *
  */
 
 typedef struct pipes_struct
@@ -173,7 +191,12 @@ typedef struct pipes_struct
 
        fstring name;
        fstring pipe_srv_name;
-
+       
+       /* linked list of rpc dispatch tables associated 
+          with the open rpc contexts */
+          
+       PIPE_RPC_FNS *contexts;
+       
        RPC_HDR hdr; /* Incoming RPC header. */
        RPC_HDR_REQ hdr_req; /* Incoming request header. */
 
@@ -185,6 +208,13 @@ typedef struct pipes_struct
        uint32 ntlmssp_seq_num;
        struct dcinfo dc; /* Keeps the creds data. */
 
+        /* Hmm. In my understanding the authentication happens
+           implicitly later, so there are no two stages for
+           schannel. */
+
+       BOOL netsec_auth_validated;
+       struct netsec_auth_struct netsec_auth;
+
        /*
         * Windows user info.
         */
@@ -324,7 +354,7 @@ typedef struct smb_np_struct
 
 struct api_struct
 {  
-  char *name;
+  const char *name;
   uint8 opnum;
   BOOL (*fn) (pipes_struct *);
 };
@@ -332,7 +362,7 @@ struct api_struct
 typedef struct
 {  
        uint32 rid;
-       char *name;
+       const char *name;
 
 } rid_name;
 
@@ -358,6 +388,9 @@ struct acct_info
 /* security descriptor structures */
 #include "rpc_secdes.h"
 
+/* pac */
+#include "authdata.h"
+
 /* different dce/rpc pipes */
 #include "rpc_lsa.h"
 #include "rpc_netlogon.h"
@@ -367,6 +400,7 @@ struct acct_info
 #include "rpc_wkssvc.h"
 #include "rpc_spoolss.h"
 #include "rpc_dfs.h"
-#include "sids.h"
+#include "rpc_ds.h"
+#include "rpc_echo.h"
 
 #endif /* _NT_DOMAIN_H */