From e81c2946e8c1e28bf101d038044fa930d630c3bf Mon Sep 17 00:00:00 2001 From: tsauerbeck Date: Thu, 1 Apr 2004 16:37:47 +0000 Subject: [PATCH] Fixed a compilation error spotted by RbdPngn SVN revision: 9553 --- legacy/ecore/src/lib/ecore_con/ecore_con.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c index f9f28ada52..b2d9e0f1b6 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c @@ -273,7 +273,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type, const void *data) { Ecore_Con_Server *svr; - Ecore_Con_Type type = compl_type & ~ECORE_CON_USE_SSL; + Ecore_Con_Type type = compl_type; struct sockaddr_un socket_unix; struct sockaddr_in socket_addr; int curstate = 0; @@ -286,7 +286,12 @@ ecore_con_server_connect(Ecore_Con_Type compl_type, /* remote system socket: TCP/IP: [name]:[port] */ svr = calloc(1, sizeof(Ecore_Con_Server)); if (!svr) return NULL; - + +#if USE_OPENSSL + /* unset the SSL flag for the following checks */ + type &= ~ECORE_CON_USE_SSL; +#endif + if ((type == ECORE_CON_LOCAL_USER) || (type == ECORE_CON_LOCAL_SYSTEM)) {