regressions

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/nntp.c b/nntp.c
index 914df39..e6dbf40 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -234,12 +234,12 @@ static int nntp_parse_url(const char *server, ACCOUNT *act, char *group,
     m_strcpy(s, sizeof(s), server);
     url_parse_ciss(&url, s);
 
-    if (url.scheme != U_NNTP || url.scheme != U_NNTPS)
+    if (url.scheme != U_NNTP && url.scheme != U_NNTPS)
         return -1;
 
     act->has_ssl = (url.scheme == U_NNTPS);
     if (!act->port) {
-        act->port = act->has_ssl ? NNTP_PORT : NNTP_SSL_PORT;
+        act->port = act->has_ssl ? NNTP_SSL_PORT : NNTP_PORT;
     }
     m_strcpy(group, group_len, url.path);
 
@@ -1047,7 +1047,7 @@ static int nntp_auth (nntp_server_t * serv)
 {
   CONNECTION *conn = serv->conn;
   char buf[STRING];
-  unsigned char flags = conn->account.flags;
+  int flags = conn->account.flags;
 
   if (mutt_account_getuser(&conn->account) || !conn->account.user[0] ||
       mutt_account_getpass(&conn->account) || !conn->account.pass[0]) {