diff options
| author | Simo Sorce <idra@samba.org> | 2010-07-20 13:26:36 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-28 12:19:32 -0400 |
| commit | 2463a871776bb4de8653d6a44469d2adb3ec9418 (patch) | |
| tree | fe715ba8a3bc4a6853ec1173f9242c72d980e802 /source3/include | |
| parent | 1e915d231d4191bf3a0bb54ba99a31ad6b2afd3b (diff) | |
| download | samba-2463a871776bb4de8653d6a44469d2adb3ec9418.tar.gz samba-2463a871776bb4de8653d6a44469d2adb3ec9418.tar.bz2 samba-2463a871776bb4de8653d6a44469d2adb3ec9418.zip | |
s3-dcerpc: Use dcerpc_AuthType in pipe_auth_data
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/ntdomain.h | 10 | ||||
| -rw-r--r-- | source3/include/proto.h | 1 |
2 files changed, 7 insertions, 4 deletions
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 { diff --git a/source3/include/proto.h b/source3/include/proto.h index b3303515ff..5ad7fe4a24 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4752,7 +4752,6 @@ const struct ndr_interface_table *get_iface_from_syntax( const struct ndr_syntax_id *syntax); const char *get_pipe_name_from_syntax(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *syntax); -enum dcerpc_AuthType map_pipe_auth_type_to_rpc_auth_type(enum pipe_auth_type auth_type); struct tevent_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx, struct event_context *ev, |