diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-15 11:48:23 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-15 11:48:23 -0700 |
| commit | dac0fb0b7c369255e0d07e47a11f6a0288019da1 (patch) | |
| tree | 63b513e26972b3c5286a015b6dc110b4b20b1305 /source3/include/ntdomain.h | |
| parent | efe9f952504a5a3114cada5f0caed315c4bc654d (diff) | |
| parent | e44c4141fdfa07bb3bd09f28e5f093d27f170dc8 (diff) | |
| download | samba-dac0fb0b7c369255e0d07e47a11f6a0288019da1.tar.gz samba-dac0fb0b7c369255e0d07e47a11f6a0288019da1.tar.bz2 samba-dac0fb0b7c369255e0d07e47a11f6a0288019da1.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source3/include/ntdomain.h')
| -rw-r--r-- | source3/include/ntdomain.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h index 53e89a8751..1d303ca64a 100644 --- a/source3/include/ntdomain.h +++ b/source3/include/ntdomain.h @@ -132,13 +132,6 @@ 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; @@ -155,7 +148,7 @@ struct schannel_auth_struct { 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; |