querysecret now shows the real, fairdinkum, decrypted secret :-)

[samba.git] / source3 / include / ntdomain.h

diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 329cb1e32549b4219e41699404c0efa27d0b4a18..5592a59eaa240f5871bd645cff98194020af4c04 100644 (file)
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -26,18 +26,22 @@
 
 
 /* dce/rpc support */
-#include "lib/rpc/include/rpc_dce.h"
+#include "rpc_dce.h"
 
 /* miscellaneous structures / defines */
-#include "lib/rpc/include/rpc_misc.h"
+#include "rpc_misc.h"
+
+/* security descriptor structures */
+#include "rpc_secdes.h" 
 
 /* different dce/rpc pipes */
-#include "lib/rpc/include/rpc_lsa.h"
-#include "lib/rpc/include/rpc_netlogon.h"
-#include "lib/rpc/include/rpc_reg.h"
-#include "lib/rpc/include/rpc_samr.h"
-#include "lib/rpc/include/rpc_srvsvc.h"
-#include "lib/rpc/include/rpc_wkssvc.h"
+#include "rpc_lsa.h"
+#include "rpc_netlogon.h"
+#include "rpc_reg.h"
+#include "rpc_samr.h"
+#include "rpc_srvsvc.h"
+#include "rpc_svcctl.h"
+#include "rpc_wkssvc.h"
 
 /* 
  * A bunch of stuff that was put into smb.h
@@ -53,46 +57,58 @@ typedef struct
 
 } prs_struct;
 
-typedef struct
+typedef struct pipes_struct
 {
-       int cnum; 
-       int uid;
+       struct pipes_struct *next, *prev;
+       int pnum;
+       connection_struct *conn;
+       uint16 vuid;
        BOOL open; /* open connection */
        uint16 device_state;
+       uint16 priority;
        fstring name;
        fstring pipe_srv_name;
 
        prs_struct rhdr; /* output header */
        prs_struct rdata; /* output data */
+       prs_struct rdata_i; /* output data (intermediate, for fragments) */
        prs_struct rauth; /* output authentication verifier */
+       prs_struct rverf; /* output verifier */
+       prs_struct rntlm; /* output ntlmssp */
 
        RPC_HDR     hdr;
        RPC_HDR_BA  hdr_ba;
        RPC_HDR_RB  hdr_rb;
        RPC_HDR_REQ  hdr_req;
        RPC_HDR_RESP hdr_resp;
+       RPC_HDR_AUTH  auth_info;
+       RPC_HDR_AUTHA autha_info;
 
-       RPC_AUTH_NTLMSSP_REQ  ntlmssp_req;
+       RPC_AUTH_VERIFIER     auth_verifier;
+       RPC_AUTH_NTLMSSP_NEG  ntlmssp_neg;
+       RPC_AUTH_NTLMSSP_CHAL ntlmssp_chal;
        RPC_AUTH_NTLMSSP_RESP ntlmssp_resp;
+       RPC_AUTH_NTLMSSP_CHK  ntlmssp_chk;
+
+       BOOL ntlmssp_auth;
+       BOOL ntlmssp_validated;
+       unsigned char ntlmssp_hash[258];
+       uint32 ntlmssp_seq_num;
+       fstring user_name;
+       fstring domain;
+       fstring wks;
 
        uint32 file_offset;
+       uint32 prev_pdu_file_offset;
        uint32 hdr_offsets;
-       uint32 frag_len_left;
-       uint32 next_frag_start;
 
 } pipes_struct;
 
-struct acct_info
-{  
-       fstring acct_name; /* account name */
-       uint32 smb_userid; /* domain-relative RID */
-};
-
 struct api_struct
 {  
   char *name;
   uint8 opnum;
-  void (*fn) (int uid, prs_struct*, prs_struct*);
+  void (*fn) (uint16 vuid, prs_struct*, prs_struct*);
 };
 
 struct mem_desc
@@ -126,5 +142,12 @@ typedef struct
 
 } rid_name;
 
+struct acct_info
+{
+    fstring acct_name; /* account name */
+    fstring acct_desc; /* account description */
+    uint32  rid; /* domain-relative RID */
+};
+
 #endif /* _NT_DOMAIN_H */