[gtk-vnc] Replace #if HAVE_SASL with #ifdef HAVE_SASL
- From: Daniel P. Berrange <dberrange src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-vnc] Replace #if HAVE_SASL with #ifdef HAVE_SASL
- Date: Fri, 10 Feb 2012 17:16:41 +0000 (UTC)
commit fb0054de66c7b8b7f22396cc9cc0e4b02e05321b
Author: Daniel P. Berrange <berrange redhat com>
Date: Fri Feb 10 17:07:57 2012 +0000
Replace #if HAVE_SASL with #ifdef HAVE_SASL
src/vncconnection.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/vncconnection.c b/src/vncconnection.c
index b65eb9c..1187486 100644
--- a/src/vncconnection.c
+++ b/src/vncconnection.c
@@ -44,7 +44,7 @@
#include <gnutls/x509.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#if HAVE_SASL
+#ifdef HAVE_SASL
#include <sasl/sasl.h>
#endif
@@ -127,7 +127,7 @@ struct _VncConnectionPrivate
gboolean want_cred_password;
gboolean want_cred_x509;
-#if HAVE_SASL
+#ifdef HAVE_SASL
sasl_conn_t *saslconn; /* SASL context */
const char *saslDecoded;
unsigned int saslDecodedLength;
@@ -675,7 +675,7 @@ static int vnc_connection_read_wire(VncConnection *conn, void *data, size_t len)
}
-#if HAVE_SASL
+#ifdef HAVE_SASL
/*
* Read at least 1 more byte of data out of the SASL decrypted
* data buffer, into the internal read buffer
@@ -748,7 +748,7 @@ static int vnc_connection_read_plain(VncConnection *conn)
*/
static int vnc_connection_read_buf(VncConnection *conn)
{
-#if HAVE_SASL
+#ifdef HAVE_SASL
VncConnectionPrivate *priv = conn->priv;
//VNC_DEBUG("Start read %d", priv->has_error);
@@ -867,7 +867,7 @@ static void vnc_connection_flush_wire(VncConnection *conn,
}
-#if HAVE_SASL
+#ifdef HAVE_SASL
/*
* Encode all buffered data, write all encrypted data out
* to the wire
@@ -916,7 +916,7 @@ static void vnc_connection_flush(VncConnection *conn)
VncConnectionPrivate *priv = conn->priv;
//VNC_DEBUG("Start flush write %d", priv->has_error);
-#if HAVE_SASL
+#ifdef HAVE_SASL
if (priv->saslconn)
vnc_connection_flush_sasl(conn);
else
@@ -3503,7 +3503,7 @@ static gboolean vnc_connection_perform_auth_ard(VncConnection *conn)
}
-#if HAVE_SASL
+#ifdef HAVE_SASL
/*
* NB, keep in sync with similar method in qemud/remote.c
*/
@@ -4197,7 +4197,7 @@ static gboolean vnc_connection_perform_auth_tls(VncConnection *conn)
return TRUE;
case VNC_CONNECTION_AUTH_VNC:
return vnc_connection_perform_auth_vnc(conn);
-#if HAVE_SASL
+#ifdef HAVE_SASL
case VNC_CONNECTION_AUTH_SASL:
return vnc_connection_perform_auth_sasl(conn);
#endif
@@ -4308,7 +4308,7 @@ static gboolean vnc_connection_perform_auth_vencrypt(VncConnection *conn)
VNC_DEBUG("Handing off to VNC auth");
return vnc_connection_perform_auth_vnc(conn);
-#if HAVE_SASL
+#ifdef HAVE_SASL
/* SASL layered over TLS */
case VNC_CONNECTION_AUTH_VENCRYPT_TLSSASL:
case VNC_CONNECTION_AUTH_VENCRYPT_X509SASL:
@@ -4399,7 +4399,7 @@ static gboolean vnc_connection_perform_auth(VncConnection *conn)
case VNC_CONNECTION_AUTH_VENCRYPT:
return vnc_connection_perform_auth_vencrypt(conn);
-#if HAVE_SASL
+#ifdef HAVE_SASL
case VNC_CONNECTION_AUTH_SASL:
return vnc_connection_perform_auth_sasl(conn);
#endif
@@ -4673,7 +4673,7 @@ static void vnc_connection_close(VncConnection *conn)
gnutls_bye(priv->tls_session, GNUTLS_SHUT_RDWR);
priv->tls_session = NULL;
}
-#if HAVE_SASL
+#ifdef HAVE_SASL
if (priv->saslconn) {
sasl_dispose (&priv->saslconn);
priv->saslconn = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]