diff options
| author | Simo Sorce <idra@samba.org> | 2010-09-03 11:03:49 -0400 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-09-23 10:54:23 -0700 |
| commit | d10e192b83e2c016873d7c2198f62173834287f0 (patch) | |
| tree | 72d9d6ed8ce885825651d9d79b20b72bd90997a9 /source3/rpc_server | |
| parent | b475cfd0b2376fdf2a8426f33be8c940b035fe26 (diff) | |
| download | samba-d10e192b83e2c016873d7c2198f62173834287f0.tar.gz samba-d10e192b83e2c016873d7c2198f62173834287f0.tar.bz2 samba-d10e192b83e2c016873d7c2198f62173834287f0.zip | |
s3-dcerpc: finally remove the legaqcy spnego_type variable from pipe_auth_data
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_pipe.c | 6 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index 3e56646aa2..ba6acc8289 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -548,7 +548,6 @@ static bool setup_bind_nak(struct pipes_struct *p, struct ncacn_packet *pkt) free_pipe_auth_data(&p->auth); p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE; p->auth.auth_type = DCERPC_AUTH_TYPE_NONE; - p->auth.spnego_type = PIPE_AUTH_TYPE_SPNEGO_NONE; p->pipe_bound = False; return True; @@ -1186,7 +1185,6 @@ static bool api_pipe_bind_req(struct pipes_struct *p, /* Unauthenticated bind request. */ /* We're finished - no more packets. */ p->auth.auth_type = DCERPC_AUTH_TYPE_NONE; - p->auth.spnego_type = PIPE_AUTH_TYPE_SPNEGO_NONE; /* We must set the pipe auth_level here also. */ p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE; p->pipe_bound = True; @@ -1546,8 +1544,8 @@ static bool api_pipe_request(struct pipes_struct *p, if (p->pipe_bound && ((p->auth.auth_type == DCERPC_AUTH_TYPE_NTLMSSP) || - ((p->auth.auth_type == DCERPC_AUTH_TYPE_SPNEGO) && - (p->auth.spnego_type == PIPE_AUTH_TYPE_SPNEGO_NTLMSSP)))) { + (p->auth.auth_type == DCERPC_AUTH_TYPE_KRB5) || + (p->auth.auth_type == DCERPC_AUTH_TYPE_SPNEGO))) { if(!become_authenticated_pipe_user(p)) { data_blob_free(&p->out_data.rdata); return False; diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 994fc7934b..efcf18af81 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -2781,8 +2781,8 @@ static NTSTATUS get_user_info_18(struct pipes_struct *p, } if ((p->auth.auth_type != DCERPC_AUTH_TYPE_NTLMSSP) || - ((p->auth.auth_type == DCERPC_AUTH_TYPE_SPNEGO) && - (p->auth.spnego_type != PIPE_AUTH_TYPE_SPNEGO_NTLMSSP))) { + (p->auth.auth_type != DCERPC_AUTH_TYPE_KRB5) || + (p->auth.auth_type != DCERPC_AUTH_TYPE_SPNEGO)) { return NT_STATUS_ACCESS_DENIED; } |