summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-09-15 08:21:00 +0200
committerGünther Deschner <gd@samba.org>2009-09-15 17:50:00 +0200
commitfdf3bd6203b35fc82bda1fd07cc91b76de3f9edd (patch)
tree24281f00fe7017f256ede3a631ec240d2e63ba2b
parente1ecb807e39264ab6bdd4a7d3dc35c95d7c17442 (diff)
downloadsamba-fdf3bd6203b35fc82bda1fd07cc91b76de3f9edd.tar.gz
samba-fdf3bd6203b35fc82bda1fd07cc91b76de3f9edd.tar.bz2
samba-fdf3bd6203b35fc82bda1fd07cc91b76de3f9edd.zip
s3-dcerpc: remove unsed auth type defines as seen on the wire.
Guenther
-rw-r--r--source3/include/rpc_dce.h13
-rw-r--r--source3/rpc_client/cli_pipe.c10
2 files changed, 5 insertions, 18 deletions
diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index e5c1e3ae3a..fc2d8809b9 100644
--- a/source3/include/rpc_dce.h
+++ b/source3/include/rpc_dce.h
@@ -53,19 +53,6 @@ enum RPC_PKT_TYPE {
#define RPC_FLG_LAST 0x02
#define RPC_FLG_NOCALL 0x20
-/* DCE RPC auth types - extended by Microsoft. */
-#define RPC_ANONYMOUS_AUTH_TYPE 0
-#define RPC_AUTH_TYPE_KRB5_1 1
-#define RPC_SPNEGO_AUTH_TYPE 9
-#define RPC_NTLMSSP_AUTH_TYPE 10
-#define RPC_KRB5_AUTH_TYPE 16 /* Not yet implemented. */
-#define RPC_SCHANNEL_AUTH_TYPE 68 /* 0x44 */
-
-#if 0
-#define RPC_PIPE_AUTH_SIGN_LEVEL 0x5
-#define RPC_PIPE_AUTH_SEAL_LEVEL 0x6
-#endif
-
/* Netlogon schannel auth type and level */
#define SCHANNEL_SIGN_SIGNATURE { 0x77, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 }
#define SCHANNEL_SEAL_SIGNATURE { 0x77, 0x00, 0x7a, 0x00, 0xff, 0xff, 0x00, 0x00 }
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 9fa33cc7c6..a189b708eb 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -123,20 +123,20 @@ static int map_pipe_auth_type_to_rpc_auth_type(enum pipe_auth_type auth_type)
switch (auth_type) {
case PIPE_AUTH_TYPE_NONE:
- return RPC_ANONYMOUS_AUTH_TYPE;
+ return DCERPC_AUTH_TYPE_NONE;
case PIPE_AUTH_TYPE_NTLMSSP:
- return RPC_NTLMSSP_AUTH_TYPE;
+ return DCERPC_AUTH_TYPE_NTLMSSP;
case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
case PIPE_AUTH_TYPE_SPNEGO_KRB5:
- return RPC_SPNEGO_AUTH_TYPE;
+ return DCERPC_AUTH_TYPE_SPNEGO;
case PIPE_AUTH_TYPE_SCHANNEL:
- return RPC_SCHANNEL_AUTH_TYPE;
+ return DCERPC_AUTH_TYPE_SCHANNEL;
case PIPE_AUTH_TYPE_KRB5:
- return RPC_KRB5_AUTH_TYPE;
+ return DCERPC_AUTH_TYPE_KRB5;
default:
DEBUG(0,("map_pipe_auth_type_to_rpc_type: unknown pipe "