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

[mmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index aa396fd..e7ea911 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -26,8 +26,8 @@ extern int  client(char *args, char *protocol, char *service, int rproto,
 #endif
 
 #ifdef CYRUS_SASL
-# include <sasl.h>
-# include <saslutil.h>
+# include <sasl/sasl.h>
+# include <sasl/saslutil.h>
 #endif /* CYRUS_SASL */
 
 #include <h/popsbr.h>
@@ -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,28 +556,22 @@ 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
-# ifdef KPOP
        if ( kpop ) {
+# ifdef KPOP
            snprintf (buffer, sizeof(buffer), "%s/%s", KPOP_PRINCIPAL, "kpop");
            if ((fd1 = client (host, "tcp", buffer, 0, response, sizeof(response))) == NOTOK) {
                return NOTOK;
            }
-       } else {
+# else  /* KPOP */
+           snprintf (response, sizeof(response), "this version of nmh compiled without KPOP support");
+           return NOTOK;
 # endif /* KPOP */
+       } else {
            if ((fd1 = client (host, "tcp", POPSERVICE, rpop, response, sizeof(response))) == NOTOK) {
                return NOTOK;
            }
-# ifdef KPOP
        }
-# endif /* KPOP */
 #else  /* NNTP */
        if ((fd1 = client (host, "tcp", "nntp", rpop, response, sizeof(response))) == NOTOK)
            return NOTOK;