r10656: BIG merge from trunk. Features not copied over

[samba.git] / source / include / rpc_misc.h

diff --git a/source/include/rpc_misc.h b/source/include/rpc_misc.h
index dcc0ecc554ab49ab47a96d649fffa7e5a708c4f5..e5d91c1b6300750911fbb895981f7be3798e18ef 100644 (file)
--- a/source/include/rpc_misc.h
+++ b/source/include/rpc_misc.h
@@ -21,9 +21,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "ntdomain.h"
-#include "rpc_dce.h"
-
 #ifndef _RPC_MISC_H /* _RPC_MISC_H */
 #define _RPC_MISC_H 
 
@@ -129,17 +126,20 @@ typedef struct {
  * Buffer Headers -- use by SEC_DESC_BUF in winreg and netlogon code
  **********************************************************************/
  
+/* TODO: replace this with an encompassing buffer structure */
 typedef struct {
        uint32 buf_max_len;
        uint32 buf_len;
 } BUFHDR;
 
+/* this is a BUFHDR + a pointer to a buffer */
 typedef struct {
        uint32 info_level;
        uint32 length;          /* uint8 chars */
        uint32 buffer;
 } BUFHDR2;
 
+/* generic buffer ?  wrapped around void*? */
 typedef struct {
        uint32 size;
        uint32 buffer;
@@ -152,7 +152,8 @@ typedef struct {
 
 /* buffer used by \winreg\ calls to fill in arbitrary REG_XXX values.
    It *may* look like a UNISTR2 but it is *not*.  This is not a goof
-   by the winreg developers.  It is a generic buffer */
+   by the winreg developers.  It is a generic buffer.  buffer length
+   is stored in bytes (not # of uint16's) */
 
 typedef struct {
        uint32 buf_max_len;
@@ -215,10 +216,12 @@ typedef struct {          /* UNISTR2 - unicode string size (in
                                  should include the NULL character */
 } UNISTR2;
 
+/* i think this is the same as a BUFFER5 used in the spoolss code --jerry */
+/* not sure about how the termination matches between the uint16 buffers thought */
+
 typedef struct {               /* UNISTR3 - XXXX not sure about this structure */
        uint32 uni_str_len;
        UNISTR str;
-
 } UNISTR3;
 
 typedef struct {               /* Buffer wrapped around a UNISTR2 */
@@ -296,8 +299,7 @@ typedef struct {
  **********************************************************************/
 
 /* DOM_CLNT_SRV - client / server names */
-typedef struct clnt_srv_info
-{
+typedef struct clnt_srv_info {
        uint32  undoc_buffer; /* undocumented 32 bit buffer pointer */
        UNISTR2 uni_logon_srv; /* logon server name */
        uint32  undoc_buffer2; /* undocumented 32 bit buffer pointer */
@@ -305,8 +307,7 @@ typedef struct clnt_srv_info
 } DOM_CLNT_SRV;
 
 /* DOM_LOG_INFO - login info */
-typedef struct log_info
-{
+typedef struct log_info {
        uint32  undoc_buffer; /* undocumented 32 bit buffer pointer */
        UNISTR2 uni_logon_srv; /* logon server name */
        UNISTR2 uni_acct_name; /* account name */
@@ -315,89 +316,44 @@ typedef struct log_info
 } DOM_LOG_INFO;
 
 /* DOM_CHAL - challenge info */
-typedef struct chal_info
-{
+typedef struct chal_info {
        uchar data[8]; /* credentials */
 } DOM_CHAL;
  
 /* DOM_CREDs - timestamped client or server credentials */
-typedef struct cred_info
-{
+typedef struct cred_info {
        DOM_CHAL challenge; /* credentials */
        UTIME timestamp;    /* credential time-stamp */
 } DOM_CRED;
 
 /* DOM_CLNT_INFO - client info */
-typedef struct clnt_info
-{
+typedef struct clnt_info {
        DOM_LOG_INFO login;
        DOM_CRED     cred;
 } DOM_CLNT_INFO;
 
 /* DOM_CLNT_INFO2 - client info */
-typedef struct clnt_info2
-{
+typedef struct clnt_info2 {
        DOM_CLNT_SRV login;
        uint32        ptr_cred;
        DOM_CRED      cred;
 } DOM_CLNT_INFO2;
 
 /* DOM_LOGON_ID - logon id */
-typedef struct logon_info
-{
+typedef struct logon_info {
        uint32 low;
        uint32 high;
 } DOM_LOGON_ID;
 
 /* OWF INFO */
-typedef struct owf_info
-{
+typedef struct owf_info {
        uint8 data[16];
 } OWF_INFO;
 
-
-
-
-
-/*
- * A client connection's state, pipe name, 
- * user credentials, etc...
- */
-typedef struct _cli_auth_fns cli_auth_fns;
-struct user_creds;
-struct cli_connection {
-
-        char                    *srv_name;
-        char                    *pipe_name;
-        struct user_creds       usr_creds;
-
-        struct cli_state        *pCli_state;
-
-        cli_auth_fns            *auth;
-
-        void                    *auth_info;
-        void                    *auth_creds;
-};
-
-
-/* 
- * Associate a POLICY_HND with a cli_connection
- */
-typedef struct rpc_hnd_node {
-
-       POLICY_HND              hnd;
-       struct cli_connection   *cli;
-
-} RPC_HND_NODE;
-
 typedef struct uint64_s
 {
        uint32 low;
        uint32 high;
 } UINT64_S;
 
-
-
-
-
 #endif /* _RPC_MISC_H */