s3-dcerpc: remove duplicate RPC_AUTH_LEVEL flags.

Guenther

diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index 7992658a7208120ff553812bce4e4c4d8e447d1e..27ad3c3febc1c9f957cffaf63a64528da3c3aa18 100644 (file)
--- a/source3/include/rpc_dce.h
+++ b/source3/include/rpc_dce.h
@@ -64,15 +64,6 @@ enum RPC_PKT_TYPE {
 #define RPC_KRB5_AUTH_TYPE        16 /* Not yet implemented. */ 
 #define RPC_SCHANNEL_AUTH_TYPE    68 /* 0x44 */
 
-/* DCE-RPC standard identifiers to indicate 
-   signing or sealing of an RPC pipe */
-#define RPC_AUTH_LEVEL_NONE      1
-#define RPC_AUTH_LEVEL_CONNECT   2
-#define RPC_AUTH_LEVEL_CALL      3
-#define RPC_AUTH_LEVEL_PACKET    4
-#define RPC_AUTH_LEVEL_INTEGRITY 5
-#define RPC_AUTH_LEVEL_PRIVACY   6
-
 #if 0
 #define RPC_PIPE_AUTH_SIGN_LEVEL 0x5
 #define RPC_PIPE_AUTH_SEAL_LEVEL 0x6

diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index fee37ba6e30392d19312aadedf56a4eafeadb9b2..257094e35f1026f568c7454ff72234588b477678 100644 (file)
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -197,9 +197,9 @@ static bool create_next_pdu_ntlmssp(pipes_struct *p)
                auth_type = RPC_SPNEGO_AUTH_TYPE;
        }
        if (p->auth.auth_level == DCERPC_AUTH_LEVEL_PRIVACY) {
-               auth_level = RPC_AUTH_LEVEL_PRIVACY;
+               auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
        } else {
-               auth_level = RPC_AUTH_LEVEL_INTEGRITY;
+               auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
        }
 
        init_rpc_hdr_auth(&auth_info, auth_type, auth_level, ss_padding_len, 1 /* context id. */);
@@ -416,7 +416,7 @@ static bool create_next_pdu_schannel(pipes_struct *p)
                init_rpc_hdr_auth(&auth_info,
                                RPC_SCHANNEL_AUTH_TYPE,
                                p->auth.auth_level == DCERPC_AUTH_LEVEL_PRIVACY ?
-                                       RPC_AUTH_LEVEL_PRIVACY : RPC_AUTH_LEVEL_INTEGRITY,
+                                       DCERPC_AUTH_LEVEL_PRIVACY : DCERPC_AUTH_LEVEL_INTEGRITY,
                                ss_padding_len, 1);
 
                if(!smb_io_rpc_hdr_auth("hdr_auth", &auth_info,
@@ -1689,10 +1689,10 @@ bool api_pipe_bind_req(pipes_struct *p, prs_struct *rpc_in_p)
 
                /* Work out if we have to sign or seal etc. */
                switch (auth_info.auth_level) {
-                       case RPC_AUTH_LEVEL_INTEGRITY:
+                       case DCERPC_AUTH_LEVEL_INTEGRITY:
                                p->auth.auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
                                break;
-                       case RPC_AUTH_LEVEL_PRIVACY:
+                       case DCERPC_AUTH_LEVEL_PRIVACY:
                                p->auth.auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
                                break;
                        default: