* Disabled SSL for now.. not working as intended...

* Fixed some !HAVE_SSL ifdef compile errors


svn: 155

src/eggdrop.h

@@ -17,7 +17,8 @@
 #  include <openssl/md5.h>
 #  define SSL_INC
 # endif /* ! SSL_INC */
-# define HAVE_SSL 1
+# undef HAVE_SSL
+/* Disabled for now # define HAVE_SSL 1 */
 #endif /* HAVE_OPENSSL_SSL_H */
 
 

src/net.c

@@ -850,9 +850,9 @@ inline int open_listen_by_af(int *port, int af_def)
 #endif /* USE_IPV6 */
 }
 
-#ifdef HAVE_SSL
 int ssl_link(register int sock, int state)
 {
+#ifdef HAVE_SSL
   int err = 0, i = 0, errs = 0;
 
   debug2("ssl_link(%d, %d)", sock, state);
@@ -913,9 +913,9 @@ int ssl_link(register int sock, int state)
     putlog(LOG_ERROR, "*", "SSL_link(%d, %d) failed", sock, state);
     dropssl(socklist[i].sock);
   }
+#endif /* HAVE_SSL */
   return 0;
 }
-#endif /* HAVE_SSL */
 
 
 /* Given a network-style IP address, returns the hostname. The hostname

src/proto.h

@@ -284,8 +284,8 @@ void set_cmd_pass(char *, int);
 /* net.c */
 #ifdef HAVE_SSL
 int ssl_cleanup();
-int ssl_link(int, int);
 #endif /* HAVE_SSL */
+int ssl_link(int, int);
 IP my_atoul(char *);
 unsigned long iptolong(IP);
 char *myipstr(int);