X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpopsbr.c;h=e7ea911e6ea4408e9569f63d5dbf231987e0e31f;hb=d72dc17f4164fd8a3e3c56a74a66a21138d82814;hp=10d9cba05879709e2ea0a45cbfa4b677a4bb771f;hpb=7b4f53959307e3434809f5dbc0ef5e0dbbb32005;p=mmh

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 10d9cba..e7ea911 100644
--- 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,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;