X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=mts%2Fsmtp%2Fsmtp.c;h=3ba9fbcdba619edb87f539cae007b8c9151575b4;hb=de3930eed91e934f7842beb8932153ca7e568047;hp=b7135f548f35ca015b1bac50e830ae2bcf0839e3;hpb=537e02c38f4bb27e746ef51706d26fe40141c5a6;p=mmh

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index b7135f5..3ba9fbc 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -316,7 +316,7 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 	 */
 
 	if (! sslctx) {
-	    SSL_METHOD *method;
+	    const SSL_METHOD *method;
 
 	    SSL_library_init();
 	    SSL_load_error_strings();
@@ -386,7 +386,7 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 	}
 
 	if (sm_debug) {
-	    SSL_CIPHER *cipher = SSL_get_current_cipher(ssl);
+	    const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl);
 	    printf("SSL negotiation successful: %s(%d) %s\n",
 		   SSL_CIPHER_get_name(cipher),
 		   SSL_CIPHER_get_bits(cipher, NULL),
@@ -1496,7 +1496,7 @@ sm_rrecord (char *buffer, int *len)
     buffer[*len = 0] = 0;
 
     if ((retval = sm_fgets (buffer, BUFSIZ, sm_rfp)) != RP_OK)
-	return retval;
+	return sm_rerror (retval);
     *len = strlen (buffer);
     /* *len should be >0 except on EOF, but check for safety's sake */
     if (*len == 0)