Align with legacy_6x.

* Normalize include order.
* Backport missed bug fixes.
* Remove dead code.

1 files changed, 4 insertions, 3 deletions

diff --git a/opie.c b/opie.c
index c186908f..367932bc 100644
--- a/opie.c
+++ b/opie.c
@@ -5,13 +5,14 @@
  */
 
 #include  "config.h"
+#include  "fetchmail.h"
+
 #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"
@@ -43,7 +44,7 @@ int do_otp(int sock, const char *command, struct query *ctl)
 	return PS_AUTHFAIL;
     }
 
-    to64frombits(buffer, ctl->remotename, strlen(ctl->remotename), sizeof buffer);
+    to64frombits(buffer, ctl->remotename, strlen(ctl->remotename), sizeof(buffer));
 	suppress_tags = TRUE;
     gen_send(sock, "%s", buffer);
 	suppress_tags = FALSE;
@@ -70,7 +71,7 @@ int do_otp(int sock, const char *command, struct query *ctl)
     if (rval)
 	return(PS_AUTHFAIL);
 
-    to64frombits(buffer, response, strlen(response), sizeof buffer);
+    to64frombits(buffer, response, strlen(response), sizeof(buffer));
     suppress_tags = TRUE;
     gen_send(sock, "%s", buffer);
     suppress_tags = FALSE;