From 2463a871776bb4de8653d6a44469d2adb3ec9418 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Tue, 20 Jul 2010 13:26:36 -0400 Subject: s3-dcerpc: Use dcerpc_AuthType in pipe_auth_data --- source3/include/ntdomain.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source3/include/ntdomain.h') diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h index 5801fd3c32..c843bc9aea 100644 --- a/source3/include/ntdomain.h +++ b/source3/include/ntdomain.h @@ -93,8 +93,11 @@ typedef struct pipe_rpc_fns { * Can't keep in sync with wire values as spnego wraps different auth methods. */ -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 }; +enum pipe_auth_type_spnego { + PIPE_AUTH_TYPE_SPNEGO_NONE = 0, + PIPE_AUTH_TYPE_SPNEGO_NTLMSSP, + PIPE_AUTH_TYPE_SPNEGO_KRB5 +}; /* auth state for krb5. */ struct kerberos_auth_struct { @@ -105,7 +108,8 @@ struct kerberos_auth_struct { /* auth state for all bind types. */ struct pipe_auth_data { - enum pipe_auth_type auth_type; /* switch for union below. */ + enum dcerpc_AuthType auth_type; + enum pipe_auth_type_spnego spnego_type; enum dcerpc_AuthLevel auth_level; union { -- cgit