X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=opie.c;h=4b8ad4f3ead2ce5fc158f31c518ff218432f3abc;hb=83b7ec7fc36f87a2a55bfb973f5ee967b77d8e90;hp=3a23c5ef50a8cd82f6a6bea48f5d0d6b5b8af4da;hpb=8da5725d04fae61458a4944de12207256e8dbc2a;p=~andy%2Ffetchmail

diff --git a/opie.c b/opie.c
index 3a23c5ef..4b8ad4f3 100644
--- a/opie.c
+++ b/opie.c
@@ -8,22 +8,25 @@
 #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;
-    int result;
     char buffer[128];
     char challenge[OPIE_CHALLENGE_MAX+1+8];
     char response[OPIE_RESPONSE_MAX+1];
@@ -40,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))))
@@ -67,17 +70,14 @@ 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))))
 	return rval;
 
-    if (result)
-	return PS_SUCCESS;
-    else
-	return PS_AUTHFAIL;
-};
+    return PS_SUCCESS;
+}
 #endif /* OPIE_ENABLE */
 
 /* opie.c ends here */