Fix a compile error if building nmh with --enable-apop.

diff --git a/ChangeLog b/ChangeLog
index 7d02b8a11d2ca5d9dc68cebd8a7b110e3488954f..6d2553ebde09ffd0b56fc65fac158d22aed19dfb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-11-06  Peter Maydell  <pmaydell@chiark.greenend.org.uk>
 
+       * uip/popsbr.c: fix compile error which only showed up if nmh
+       was configured with --enable-apop.
+
        * Debian Bug# 245932, RedHat Bug# 172388: uip/mhparse.c: don't
        crash when handling a multipart MIME message with an invalid
        Content-Type header (file handle was being fclose()d twice).

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 6d8d820c40ffe6a1a19887fbcb6c53410b8a77d6..e7ea911e6ea4408e9569f63d5dbf231987e0e31f 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -500,6 +500,13 @@ pop_init (char *host, char *user, char *pass, char *proxy, int snoop,
     int fd1, fd2;
     char buffer[BUFSIZ];
 
+#ifdef APOP
+    int apop;
+
+    if ((apop = rpop) < 0)
+       rpop = 0;
+#endif
+
     if (proxy && *proxy) {
        int pid;
        int inpipe[2];    /* for reading from the server */
@@ -549,13 +556,6 @@ pop_init (char *host, char *user, char *pass, char *proxy, int snoop,
 
     } else {
 
-#ifdef APOP
-       int apop;
-
-       if ((apop = rpop) < 0)
-           rpop = 0;
-#endif
-
 #ifndef NNTP
        if ( kpop ) {
 # ifdef KPOP