From cb5d4a7527ee37577fc0c49eed564f237ec7c909 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Wed, 2 Nov 2005 17:43:21 +0000 Subject: [PATCH] fail when kpop connection attempted without KPOP support compiled in --- ChangeLog | 3 +++ uip/popsbr.c | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cfb87a..3b17470 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-11-02 Oliver Kiddle + * 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 diff --git a/uip/popsbr.c b/uip/popsbr.c index 10d9cba..6d8d820 100644 --- 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 -# 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; -- 1.7.10.4