* qemud/qemud.c: fix qemu+tls handshake negotiation, patch by

  Chris Lalancette
Daniel

diff --git a/ChangeLog b/ChangeLog
index c14556b95c4ce4427a7fd57b664fc0561a7b55f1..acc2dece18c14f752b75d4c1438cfab0723446f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar  3 09:24:13 CET 2009 Daniel Veillard <veillard@redhat.com>
+
+       * qemud/qemud.c: fix qemu+tls handshake negotiation, patch by
+         Chris Lalancette
+
 Mon Mar 2 20:24:00 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
 
        * python/.cvsignore: Ignore generated.stamp

diff --git a/qemud/qemud.c b/qemud/qemud.c
index e8528417f4ec04d7503ab1bcf20105262fc925d4..fd315fc20d30b219dc788b2a62281fef95f87a70 100644 (file)
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -1339,6 +1339,8 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket
         /* Begin the TLS handshake. */
         ret = gnutls_handshake (client->tlssession);
         if (ret == 0) {
+            client->handshake = 0;
+
             /* Unlikely, but ...  Next step is to check the certificate. */
             if (remoteCheckAccess (client) == -1)
                 goto cleanup;
@@ -1930,6 +1932,8 @@ qemudDispatchClientHandshake(struct qemud_server *server,
     /* Continue the handshake. */
     ret = gnutls_handshake (client->tlssession);
     if (ret == 0) {
+        client->handshake = 0;
+
         /* Finished.  Next step is to check the certificate. */
         if (remoteCheckAccess (client) == -1)
             qemudDispatchClientFailure(client);