diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-10-28 04:17:43 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:40 -0500 |
| commit | bb435cbd0313ec0ec6889181223929578603d73d (patch) | |
| tree | 9391ad673efd745e208f96537688eccfa05ddb8e /source4/librpc/rpc | |
| parent | b4a5794e0983d41beec38ddc8430e04833af5915 (diff) | |
| download | samba-bb435cbd0313ec0ec6889181223929578603d73d.tar.gz samba-bb435cbd0313ec0ec6889181223929578603d73d.tar.bz2 samba-bb435cbd0313ec0ec6889181223929578603d73d.zip | |
r19502: fixed the RPC-SECRETS test with kerberos. Andrew, can you look at this
as well?
The server side change is needed to fix a valgrind error, which was
possibly exploitable if the client sent deliberately bad data
(This used to be commit e3c04cf165fe15739197b2713e78046399aa7653)
Diffstat (limited to 'source4/librpc/rpc')
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 28e48c4a5a..bda07066ff 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -272,7 +272,6 @@ static NTSTATUS ncacn_pull_request_auth(struct dcerpc_connection *c, TALLOC_CTX return status; } - /* check signature or unseal the packet */ switch (c->security_state.auth_info->auth_level) { case DCERPC_AUTH_LEVEL_PRIVACY: @@ -433,6 +432,13 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c, return status; } dcerpc_set_auth_length(blob, creds2.length); + if (c->security_state.auth_info->credentials.length == 0) { + /* this is needed for krb5 only, to correct the total packet + length */ + dcerpc_set_frag_length(blob, + dcerpc_get_frag_length(blob) + +creds2.length); + } break; case DCERPC_AUTH_LEVEL_INTEGRITY: @@ -454,6 +460,13 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c, return status; } dcerpc_set_auth_length(blob, creds2.length); + if (c->security_state.auth_info->credentials.length == 0) { + /* this is needed for krb5 only, to correct the total packet + length */ + dcerpc_set_frag_length(blob, + dcerpc_get_frag_length(blob) + +creds2.length); + } break; case DCERPC_AUTH_LEVEL_CONNECT: |