diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-07-25 11:58:51 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-07-25 11:58:51 +1000 |
| commit | 1f285560bc66ab703b8feacd5e110e79eae619de (patch) | |
| tree | c3f8b7921fcef240737a9d06714ca758b81305ff /source4/librpc/rpc/dcerpc_util.c | |
| parent | 404846d8871d3d420e83a3e48625bb051faf893e (diff) | |
| parent | 79657f78e87b76be1579c488249bf253093aa620 (diff) | |
| download | samba-1f285560bc66ab703b8feacd5e110e79eae619de.tar.gz samba-1f285560bc66ab703b8feacd5e110e79eae619de.tar.bz2 samba-1f285560bc66ab703b8feacd5e110e79eae619de.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit b12dd8ee5443ebfc204d1684f541d68ffb351197)
Diffstat (limited to 'source4/librpc/rpc/dcerpc_util.c')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_util.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index 71c6d5f2cc..32646e85b0 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -647,11 +647,21 @@ NTSTATUS dcerpc_generic_session_key(struct dcerpc_connection *c, /* fetch the user session key - may be default (above) or the SMB session key + + The key is always truncated to 16 bytes */ _PUBLIC_ NTSTATUS dcerpc_fetch_session_key(struct dcerpc_pipe *p, - DATA_BLOB *session_key) + DATA_BLOB *session_key) { - return p->conn->security_state.session_key(p->conn, session_key); + NTSTATUS status; + status = p->conn->security_state.session_key(p->conn, session_key); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + + session_key->length = MIN(session_key->length, 16); + + return NT_STATUS_OK; } |