Remove two unused functions (prs_force_dynamic, prs_set_session_key).

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

diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index ce5d606c570985c56243a12ef877ee91aa2bb3ed..213cb9ff75d98033835b2b20df4808951bbef064 100644 (file)
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -28,6 +28,8 @@
  * in the NTDOM branch - it didn't belong there.
  */
 
+#define prs_init_empty( _ps_, _ctx_, _io_ ) (void) prs_init((_ps_), 0, (_ctx_), (_io_))
+
 typedef struct _prs_struct {
        bool io; /* parsing in or out of data stream */
        /* 
@@ -42,7 +44,6 @@ typedef struct _prs_struct {
        uint32 grow_size; /* size requested via prs_grow() calls */
        char *data_p; /* The buffer itself. */
        TALLOC_CTX *mem_ctx; /* When unmarshalling, use this.... */
-       const char *sess_key; /* If we have to do encrypt/decrypt on the fly. */
 } prs_struct;
 
 /*
@@ -112,25 +113,6 @@ typedef struct _input_data {
 
 struct handle_list;
 
-/* Domain controller authentication protocol info */
-struct dcinfo {
-       uint32 sequence; /* "timestamp" from client. */
-       struct netr_Credential seed_chal;
-       struct netr_Credential clnt_chal; /* Client credential */
-       struct netr_Credential srv_chal;  /* Server credential */
-
-       unsigned char  sess_key[16]; /* Session key */
-       unsigned char  mach_pw[16];   /* md4(machine password) */
-
-       fstring mach_acct;  /* Machine name we've authenticated. */
-
-       fstring remote_machine;  /* Machine name we've authenticated. */
-       fstring domain;
-
-       bool challenge_sent;
-       bool authenticated;
-};
-
 typedef struct pipe_rpc_fns {
 
        struct pipe_rpc_fns *next, *prev;
@@ -151,33 +133,20 @@ typedef struct pipe_rpc_fns {
 enum pipe_auth_type { PIPE_AUTH_TYPE_NONE = 0, PIPE_AUTH_TYPE_NTLMSSP, PIPE_AUTH_TYPE_SCHANNEL,
                        PIPE_AUTH_TYPE_SPNEGO_NTLMSSP, PIPE_AUTH_TYPE_KRB5, PIPE_AUTH_TYPE_SPNEGO_KRB5 };
 
-/* Possible auth levels - keep these in sync with the wire values. */
-enum pipe_auth_level { PIPE_AUTH_LEVEL_NONE = 0,
-                       PIPE_AUTH_LEVEL_CONNECT = 1,    /* We treat as NONE. */
-                       PIPE_AUTH_LEVEL_INTEGRITY = 5,  /* Sign. */
-                       PIPE_AUTH_LEVEL_PRIVACY = 6     /* Seal. */
-};
-
 /* auth state for krb5. */
 struct kerberos_auth_struct {
        const char *service_principal;
        DATA_BLOB session_key;
 };
 
-/* auth state for schannel. */
-struct schannel_auth_struct {
-       unsigned char sess_key[16];
-       uint32 seq_num;
-};
-
 /* auth state for all bind types. */
 
 struct pipe_auth_data {
        enum pipe_auth_type auth_type; /* switch for union below. */
-       enum pipe_auth_level auth_level;
+       enum dcerpc_AuthLevel auth_level;
        union {
-               struct schannel_auth_struct *schannel_auth;
-               AUTH_NTLMSSP_STATE *auth_ntlmssp_state;
+               struct schannel_state *schannel_auth;
+               struct auth_ntlmssp_state *auth_ntlmssp_state;
 /*             struct kerberos_auth_struct *kerberos_auth; TO BE ADDED... */
        } a_u;
        void (*auth_data_free_func)(struct pipe_auth_data *);
@@ -267,15 +236,4 @@ struct api_struct {
        bool (*fn) (pipes_struct *);
 };
 
-/*
- * higher order functions for use with msrpc client code
- */
-
-#define PRINT_INFO_FN(fn)\
-        void (*fn)(const char*, uint32, uint32, void  *const *const)
-#define JOB_INFO_FN(fn)\
-        void (*fn)(const char*, const char*, uint32, uint32, void *const *const)
-
-/* end higher order functions */
-
 #endif /* _NT_DOMAIN_H */