X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=opie.c;h=4b8ad4f3ead2ce5fc158f31c518ff218432f3abc;hb=910d5a2f852edb8c4e54c0e875da6a90385ab790;hp=b7687d94639280fbf2a449038ef6a8c559490d5a;hpb=d57b00768a8fa44d1e1c5f758440edabfa488baf;p=~andy%2Ffetchmail

diff --git a/opie.c b/opie.c
index b7687d94..4b8ad4f3 100644
--- a/opie.c
+++ b/opie.c
@@ -8,19 +8,23 @@
 #include  <stdio.h>
 #include  <string.h>
 #include  <ctype.h>
-#if defined(STDC_HEADERS)
 #include  <stdlib.h>
-#endif
 #include  "fetchmail.h"
 #include  "socket.h"
 
-#include  "i18n.h"
-#include "md5.h"
+#include  "gettext.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 +43,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 +70,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))))