diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2011-06-23 13:31:41 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-23 11:19:02 -0500 |
| commit | 7e7e2ebc942da8285931ceabf12823e165dced8b (patch) | |
| tree | d7d939f0efe179dfd01efc5915479623d95f8d9b /ui/vnc.h | |
| parent | e69ae5c49af45a67ebdf6a7cf465eb91b5c8ee11 (diff) | |
| download | focaccia-qemu-7e7e2ebc942da8285931ceabf12823e165dced8b.tar.gz focaccia-qemu-7e7e2ebc942da8285931ceabf12823e165dced8b.zip | |
Store VNC auth scheme per-client as well as per-server
A future patch will introduce a situation where different clients may have different authentication schemes set. When a new client arrives, copy the 'auth' and 'subauth' fields from VncDisplay into the client's VncState, and use the latter in all authentication functions. * ui/vnc.h: Add 'auth' and 'subauth' to VncState * ui/vnc-auth-sasl.c, ui/vnc-auth-vencrypt.c, ui/vnc.c: Make auth functions pull auth scheme from VncState instead of VncDisplay Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'ui/vnc.h')
| -rw-r--r-- | ui/vnc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/vnc.h b/ui/vnc.h index f10c5dc4e0..66689f1d60 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -256,8 +256,10 @@ struct VncState int major; int minor; + int auth; char challenge[VNC_AUTH_CHALLENGE_SIZE]; #ifdef CONFIG_VNC_TLS + int subauth; /* Used by VeNCrypt */ VncStateTLS tls; #endif #ifdef CONFIG_VNC_SASL |