diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-09-12 09:04:53 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-09-14 08:09:15 +0200 |
| commit | 0a6d0f8edaa198898f50f274275efba8de41d843 (patch) | |
| tree | ce0fee9fa2272f239c20fc9d6336b01674142ac0 /source3/smbd/signing.c | |
| parent | f205e4cada0a2e5d1289b5a1482dd670c65b1dfd (diff) | |
| download | samba-0a6d0f8edaa198898f50f274275efba8de41d843.tar.gz | |
s3:smb_signing: add support for easier negotiation of SMB signing
We don't make use of it yet, but it will follow.
metze
Diffstat (limited to 'source3/smbd/signing.c')
| -rw-r--r-- | source3/smbd/signing.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c index 25b3c40d7d2..1ae8ffca367 100644 --- a/source3/smbd/signing.c +++ b/source3/smbd/signing.c @@ -157,6 +157,7 @@ static void smbd_shm_signing_free(TALLOC_CTX *mem_ctx, void *ptr) bool srv_init_signing(struct smbd_server_connection *conn) { bool allowed = true; + bool desired; bool mandatory = false; switch (lp_server_signing()) { @@ -172,6 +173,8 @@ bool srv_init_signing(struct smbd_server_connection *conn) break; } + desired = allowed; + if (lp_async_smb_echo_handler()) { struct smbd_shm_signing *s; @@ -189,7 +192,7 @@ bool srv_init_signing(struct smbd_server_connection *conn) } talloc_set_destructor(s, smbd_shm_signing_destructor); conn->smb1.signing_state = smb_signing_init_ex(s, - allowed, mandatory, + allowed, desired, mandatory, smbd_shm_signing_alloc, smbd_shm_signing_free); if (!conn->smb1.signing_state) { @@ -199,7 +202,7 @@ bool srv_init_signing(struct smbd_server_connection *conn) } conn->smb1.signing_state = smb_signing_init(server_event_context(), - allowed, mandatory); + allowed, desired, mandatory); if (!conn->smb1.signing_state) { return false; } @@ -209,7 +212,8 @@ bool srv_init_signing(struct smbd_server_connection *conn) void srv_set_signing_negotiated(struct smbd_server_connection *conn) { - smb_signing_set_negotiated(conn->smb1.signing_state); + smb_signing_set_negotiated(conn->smb1.signing_state, + true, false); } /*********************************************************** |