fail when kpop connection attempted without KPOP support compiled in

diff --git a/ChangeLog b/ChangeLog
index 5cfb87a..3b17470 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-11-02  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
 2005-11-02  Oliver Kiddle  <okiddle@yahoo.co.uk>
 

+       * Debian Bug# 320069: Nick Rusnov: uip/popsbr.c: fail when
+       kpop connection attempted without KPOP support compiled in
+

        * Debian Bug# 320090: Nick Rusnov: sbr/Makefile.in: fix for newer
        version of flex and remove autogenerated file from cvs
 
        * Debian Bug# 320090: Nick Rusnov: sbr/Makefile.in: fix for newer
        version of flex and remove autogenerated file from cvs
 

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 10d9cba..6d8d820 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -557,20 +557,21 @@ pop_init (char *host, char *user, char *pass, char *proxy, int snoop,
 #endif
 
 #ifndef NNTP
 #endif
 
 #ifndef NNTP

-# ifdef KPOP

        if ( 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;
            }
            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 */
 # endif /* KPOP */

+       } else {

            if ((fd1 = client (host, "tcp", POPSERVICE, rpop, response, sizeof(response))) == NOTOK) {
                return NOTOK;
            }
            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;
 #else  /* NNTP */
        if ((fd1 = client (host, "tcp", "nntp", rpop, response, sizeof(response))) == NOTOK)
            return NOTOK;