Minor bug fixes for socket.c

[~andy/fetchmail] / opie.c

diff --git a/opie.c b/opie.c
index b7687d94639280fbf2a449038ef6a8c559490d5a..26f3c93cc561e610120b2eb21538b066fb9dfbec 100644 (file)
--- a/opie.c
+++ b/opie.c
@@ -15,12 +15,18 @@
 #include  "socket.h"
 
 #include  "i18n.h"
-#include "md5.h"
+#include "fm_md5.h"
 
 #ifdef OPIE_ENABLE
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include <opie.h>
+#ifdef __cplusplus
+}
+#endif
 
-int do_otp(int sock, char *command, struct query *ctl)
+int do_otp(int sock, const char *command, struct query *ctl)
 {
     int i, rval;
     char buffer[128];
@@ -39,7 +45,7 @@ int do_otp(int sock, char *command, struct query *ctl)
 
     to64frombits(buffer, ctl->remotename, strlen(ctl->remotename));
        suppress_tags = TRUE;
-    gen_send(sock, buffer, sizeof(buffer));
+    gen_send(sock, "%s", buffer);
        suppress_tags = FALSE;
 
     if ((rval = gen_recv(sock, buffer, sizeof(buffer))))
@@ -66,7 +72,7 @@ int do_otp(int sock, char *command, struct query *ctl)
 
     to64frombits(buffer, response, strlen(response));
     suppress_tags = TRUE;
-    gen_send(sock, buffer, strlen(buffer));
+    gen_send(sock, "%s", buffer);
     suppress_tags = FALSE;
 
     if ((rval = gen_recv(sock, buffer, sizeof(buffer))))