* Renamed "dynloader" to "serv_extensions" globally. We don't want people

[citadel.git] / citadel / serv_crypto.c

diff --git a/citadel/serv_crypto.c b/citadel/serv_crypto.c
index cda02a57067fccd82adc9089bbf676c38f3fbddc..7a87f064f074b89d64d403104f3bfa584082f398 100644 (file)
--- a/citadel/serv_crypto.c
+++ b/citadel/serv_crypto.c
@@ -34,7 +34,7 @@
 #include "server.h"
 #include "serv_crypto.h"
 #include "sysdep_decls.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
 
 
 #ifdef HAVE_OPENSSL
@@ -42,7 +42,7 @@ SSL_CTX *ssl_ctx;                             /* SSL context */
 pthread_mutex_t **SSLCritters;                 /* Things needing locking */
 
 static unsigned long id_callback(void) {
-       return pthread_self();
+       return (unsigned long)pthread_self();
 }
 
 void init_ssl(void)
@@ -253,7 +253,7 @@ void cmd_stls(char *params)
                                ERR_reason_error_string(ERR_get_error()));
                return;
        }
-       cprintf("%d \n", OK);
+       cprintf("%d \n", CIT_OK);
        retval = SSL_accept(CC->ssl);
        if (retval < 1) {
                /*
@@ -292,7 +292,7 @@ void cmd_gtls(char *params)
                return;
        }
        bits = SSL_CIPHER_get_bits(SSL_get_current_cipher(CC->ssl), &alg_bits);
-       cprintf("%d %s|%s|%d|%d\n", OK,
+       cprintf("%d %s|%s|%d|%d\n", CIT_OK,
                SSL_CIPHER_get_version(SSL_get_current_cipher(CC->ssl)),
                SSL_CIPHER_get_name(SSL_get_current_cipher(CC->ssl)),
                alg_bits, bits);