* Build fixes for Solaris box without OpenSSL installed

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 55fb7bbf7dcdae06fb0ec5f0ce27f7df12cc57b0..a541ebc903d3f3d368a634c366a35cf152d7a163 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 601.21  2002/10/07 18:59:37  ajc
+ * Build fixes for Solaris box without OpenSSL installed
+
  Revision 601.20  2002/10/07 09:40:49  error
  * Don't try to compile non-existent client_crypto.c (oops!)
 
@@ -4055,3 +4058,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 64649facedd77871228e5c44a89f31f0406a2509..30de03c9eb5a0d4857b8bef9bec328e90f5442dd 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -32,6 +32,7 @@
 #include <pwd.h>
 #include <setjmp.h>
 #include <stdarg.h>
+#include <errno.h>
 
 #include "citadel.h"
 #include "citadel_ipc.h"
@@ -1054,6 +1055,7 @@ int main(int argc, char **argv)
                                }
                }
 
+#ifdef HAVE_OPENSSL
        /* Evaluate encryption preferences */
        if (arg_encrypt != RC_NO && rc_encrypt != RC_NO) {
                if (!ipc->isLocal || arg_encrypt == RC_YES || rc_encrypt == RC_YES) {
@@ -1062,6 +1064,7 @@ int main(int argc, char **argv)
                                error_printf("Can't encrypt: %s\n", aaa);
                }
        }
+#endif
 
        get_serv_info(ipc, telnet_client_host);
        scr_printf("%-24s\n%s\n%s\n", serv_info.serv_software, serv_info.serv_humannode,

diff --git a/citadel/citadel_ipc.c b/citadel/citadel_ipc.c
index 5162ece6721622bbd56082830fb0ad2f6057626b..88a3b5a91af168bb82ae403e123e5dd22021c494 100644 (file)
--- a/citadel/citadel_ipc.c
+++ b/citadel/citadel_ipc.c
@@ -27,6 +27,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <sys/un.h>
+#include <errno.h>
 #ifdef THREADED_CLIENT
 #include <pthread.h>
 #endif
@@ -49,6 +50,9 @@ pthread_mutex_t **Critters;                   /* Things that need locking */
 
 #endif /* HAVE_OPENSSL */
 
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
 
 static void (*status_hook)(char *s) = NULL;
 
@@ -2259,7 +2263,9 @@ int CtdlIPCGenericCommand(CtdlIPC *ipc,
        if (!command) return -2;
        if (!proto_response) return -2;
 
+#ifdef HAVE_OPENSSL
        if (ipc->ssl) watch_ssl = 1;
+#endif
 
        CtdlIPC_lock(ipc);
        CtdlIPC_putline(ipc, command);